diff --git a/resources/assets/js/views/install/Database.vue b/resources/assets/js/views/install/Database.vue
index 41885b528..5ab74d354 100644
--- a/resources/assets/js/views/install/Database.vue
+++ b/resources/assets/js/views/install/Database.vue
@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div class="card">
         <div class="card-header wizard-header p-3">
             <el-steps :active="active" finish-status="success" align-center>
                 <el-step title="Language"></el-step>
@@ -75,13 +75,20 @@
         </div>
 
         <div class="card-footer">
-            <div class="float-right">
-                <button v-on:click="onSubmit" :disabled="form.loading" type="submit" id="next-button" class="btn btn-success header-button-top" data-loading-text="Loading...">
-                    <div class="aka-loader"></div>
-                    <span>Next &nbsp;
-                        <i  class="fa fa-arrow-right"></i>
-                    </span>
-                </button>
+            <div class="row save-buttons">
+                <div class="col-md-12">
+                    <button type="submit" @click="onSubmit" :disabled="form.loading" id="next-button" class="btn btn-icon btn-success button-submit header-button-top">
+                        <div v-if="form.loading" class="aka-loader-frame">
+                            <div class="aka-loader"></div>
+                        </div>
+                         <span v-if="!form.loading" class="btn-inner--text">
+                            Next &nbsp;
+                        </span>
+                        <span v-if="!form.loading" class="btn-inner--icon">
+                            <i class="fas fa-arrow-right"></i>
+                        </span>
+                    </button>
+                </div>
             </div>
         </div>
     </div>
diff --git a/resources/assets/js/views/install/Language.vue b/resources/assets/js/views/install/Language.vue
index 05fe46502..f65c7e1d1 100644
--- a/resources/assets/js/views/install/Language.vue
+++ b/resources/assets/js/views/install/Language.vue
@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div class="card">
         <div class="card-header wizard-header p-3">
             <el-steps :active="active" finish-status="success" align-center>
                 <el-step title="Language"></el-step>
@@ -23,13 +23,20 @@
         </div>
 
         <div class="card-footer">
-            <div class="float-right">
-                <button v-on:click="onSubmit" :disabled="form.loading" type="submit" id="next-button" class="btn btn-success header-button-top" data-loading-text="Loading...">
-                    <div class="aka-loader"></div>
-                    <span>Next &nbsp;
-                        <i  class="fa fa-arrow-right"></i>
-                    </span>
-                </button>
+            <div class="row save-buttons">
+                <div class="col-md-12">
+                    <button type="submit" @click="onSubmit" :disabled="form.loading" id="next-button" class="btn btn-icon btn-success button-submit header-button-top">
+                        <div v-if="form.loading" class="aka-loader-frame">
+                            <div class="aka-loader"></div>
+                        </div>
+                         <span v-if="!form.loading" class="btn-inner--text">
+                            Next &nbsp;
+                        </span>
+                        <span v-if="!form.loading" class="btn-inner--icon">
+                            <i class="fas fa-arrow-right"></i>
+                        </span>
+                    </button>
+                </div>
             </div>
         </div>
     </div>
diff --git a/resources/assets/js/views/install/Settings.vue b/resources/assets/js/views/install/Settings.vue
index fd5d5ebf8..11aff8e13 100644
--- a/resources/assets/js/views/install/Settings.vue
+++ b/resources/assets/js/views/install/Settings.vue
@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div class="card">
         <div class="card-header wizard-header p-3">
             <el-steps :active="active" finish-status="success" align-center>
                 <el-step title="Language"></el-step>
@@ -73,13 +73,20 @@
         </div>
 
         <div class="card-footer">
-            <div class="float-right">
-                <button v-on:click="onSubmit" :disabled="form.loading" type="submit" id="next-button" class="btn btn-success" data-loading-text="Loading...">
-                    <div class="aka-loader"></div>
-                    <span>Next &nbsp;
-                        <i  class="fa fa-arrow-right"></i>
-                    </span>
-                </button>
+            <div class="row save-buttons">
+                <div class="col-md-12">
+                    <button type="submit" @click="onSubmit" :disabled="form.loading" id="next-button" class="btn btn-icon btn-success button-submit header-button-top">
+                        <div v-if="form.loading" class="aka-loader-frame">
+                            <div class="aka-loader"></div>
+                        </div>
+                         <span v-if="!form.loading" class="btn-inner--text">
+                            Next &nbsp;
+                        </span>
+                        <span v-if="!form.loading" class="btn-inner--icon">
+                            <i class="fas fa-arrow-right"></i>
+                        </span>
+                    </button>
+                </div>
             </div>
         </div>
     </div>
diff --git a/resources/views/layouts/install.blade.php b/resources/views/layouts/install.blade.php
index c31c78ced..8406c25d7 100644
--- a/resources/views/layouts/install.blade.php
+++ b/resources/views/layouts/install.blade.php
@@ -18,44 +18,44 @@
             <div class="container mt--7 pb-5">
                 <div class="row justify-content-center">
                     <div class="col-lg-5 col-md-7">
-                        <div class="card">
+                        <div id="app">
                             {!! Form::open([
                                 'url' => url()->current(),
                                 'role' => 'form',
-                                'id' => 'form-install'
+                                'id' => 'form-install',
+                                '@submit.prevent' => 'onSubmit',
+                                '@keydown' => 'form.errors.clear($event.target.name)',
                             ]) !!}
-                                <div id="app">
-                                    <div class="card-body">
-                                        <div class="text-center text-muted mt-2 mb-4">
-                                            <small>@yield('header')</small>
-                                        </div>
-
-                                        @include('flash::message')
-
-                                        @yield('content')
-                                    </div>
-
-                                    <div class="card-footer">
-                                        <div class="float-right">
-                                            @if (Request::is('install/requirements'))
-                                                <a href="{{ route('install.requirements') }}" class="btn btn-success"> {{ trans('install.refresh') }} &nbsp;<i class="fa fa-refresh"></i></a>
-                                            @else
-                                                {!! Form::button(
-                                                    '<i v-if="loading" :class="(loading) ? \'show \' : \'\'" class="fas fa-spinner fa-spin d-none"></i> ' .
-                                                    trans('install.next') .
-                                                    ' &nbsp;<i class="fa fa-arrow-right"></i>',
-                                                    [
-                                                        ':disabled' => 'loading',
-                                                        'type' => 'submit',
-                                                        'id' => 'next-button',
-                                                        'class' => 'btn btn-success',
-                                                        'data-loading-text' => trans('general.loading')
-                                                    ]
-                                                ) !!}
-                                            @endif
-                                        </div>
-                                    </div>
+                            <div class="card-body">
+                                <div class="text-center text-muted mt-2 mb-4">
+                                    <small>@yield('header')</small>
                                 </div>
+
+                                @include('flash::message')
+
+                                @yield('content')
+                            </div>
+
+                            <div class="card-footer">
+                                <div class="float-right">
+                                    @if (Request::is('install/requirements'))
+                                        <a href="{{ route('install.requirements') }}" class="btn btn-success"> {{ trans('install.refresh') }} &nbsp;<i class="fa fa-refresh"></i></a>
+                                    @else
+                                        {!! Form::button(
+                                            '<i v-if="loading" :class="(loading) ? \'show \' : \'\'" class="fas fa-spinner fa-spin d-none"></i> ' .
+                                            trans('install.next') .
+                                            ' &nbsp;<i class="fa fa-arrow-right"></i>',
+                                            [
+                                                ':disabled' => 'loading',
+                                                'type' => 'submit',
+                                                'id' => 'next-button',
+                                                'class' => 'btn btn-success',
+                                                'data-loading-text' => trans('general.loading')
+                                            ]
+                                        ) !!}
+                                    @endif
+                                </div>
+                            </div>
                             {!! Form::close() !!}
                         </div>
                     </div>