diff --git a/app/views/dashboard/components/add.blade.php b/app/views/dashboard/components/add.blade.php
index b85aeeaa..ee971339 100644
--- a/app/views/dashboard/components/add.blade.php
+++ b/app/views/dashboard/components/add.blade.php
@@ -14,7 +14,7 @@
         <div class="row">
             <div class="col-sm-12">
                 @include('partials.dashboard.errors')
-                <form name="CreateComponentForm" class="form-vertical" role="form" action="/dashboard/components/add" method="POST">
+                <form name="CreateComponentForm" class="form-horizontal" role="form" action="/dashboard/components/add" method="POST">
                     <fieldset>
                         <div class="form-group">
                             <label for="component-name">{{ trans('forms.components.name') }}</label>
@@ -59,8 +59,10 @@
                     <input type="hidden" name="component[order]" value="0">
                     <input type="hidden" name="component[group_id]" value="0">
 
-                    <button type="submit" class="btn btn-success">{{ trans('forms.create') }}</button>
-                    <a class="btn btn-default" href="{{ route('dashboard.components') }}">{{ trans('forms.cancel') }}</a>
+                    <div class="form-group">
+                        <button type="submit" class="btn btn-success">{{ trans('forms.create') }}</button>
+                        <a class="btn btn-default" href="{{ route('dashboard.components') }}">{{ trans('forms.cancel') }}</a>
+                    </div>
                 </form>
             </div>
         </div>
diff --git a/app/views/dashboard/components/edit.blade.php b/app/views/dashboard/components/edit.blade.php
index 67d0c840..4a45a616 100644
--- a/app/views/dashboard/components/edit.blade.php
+++ b/app/views/dashboard/components/edit.blade.php
@@ -14,7 +14,7 @@
         <div class="row">
             <div class="col-sm-12">
                 @include('partials.dashboard.errors')
-                <form name="EditComponentForm" class="form-vertical" role="form" action="/dashboard/components/{{ $component->id }}/edit" method="POST">
+                <form name="EditComponentForm" class="form-horizontal" role="form" action="/dashboard/components/{{ $component->id }}/edit" method="POST">
                     <fieldset>
                         <div class="form-group">
                             <label for="incident-name">{{ trans('forms.components.name') }}</label>
@@ -59,8 +59,10 @@
                     <input type="hidden" name="component[order]" value="{{ $component->order or 0 }}">
                     <input type="hidden" name="component[group_id]" value="{{ $component->group_id or 0  }}">
 
-                    <button type="submit" class="btn btn-success">{{ trans('forms.update') }}</button>
-                    <a class="btn btn-default" href="{{ route('dashboard.components') }}">{{ trans('forms.cancel') }}</a>
+                    <div class="form-group">
+                        <button type="submit" class="btn btn-success">{{ trans('forms.update') }}</button>
+                        <a class="btn btn-default" href="{{ route('dashboard.components') }}">{{ trans('forms.cancel') }}</a>
+                    </div>
                 </form>
             </div>
         </div>
diff --git a/app/views/dashboard/components/groups/add.blade.php b/app/views/dashboard/components/groups/add.blade.php
index 6761978e..0ad7d79e 100644
--- a/app/views/dashboard/components/groups/add.blade.php
+++ b/app/views/dashboard/components/groups/add.blade.php
@@ -14,7 +14,7 @@
         <div class="row">
             <div class="col-sm-12">
                 @include('partials.dashboard.errors')
-                <form name="CreateComponentGroupForm" class="form-vertical" role="form" action="/dashboard/components/groups/add" method="POST">
+                <form name="CreateComponentGroupForm" class="form-horizontal" role="form" action="/dashboard/components/groups/add" method="POST">
                     <fieldset>
                         <div class="form-group">
                             <label for="incident-name">{{ trans('forms.components.groups.name') }}</label>
@@ -22,8 +22,10 @@
                         </div>
                     </fieldset>
 
-                    <button type="submit" class="btn btn-success">{{ trans('forms.add') }}</button>
-                    <a class="btn btn-default" href="{{ route('dashboard.components.groups') }}">{{ trans('forms.cancel') }}</a>
+                    <div class="form-group">
+                        <button type="submit" class="btn btn-success">{{ trans('forms.add') }}</button>
+                        <a class="btn btn-default" href="{{ route('dashboard.components.groups') }}">{{ trans('forms.cancel') }}</a>
+                    </div>
                 </form>
             </div>
         </div>
diff --git a/app/views/dashboard/incidents/add.blade.php b/app/views/dashboard/incidents/add.blade.php
index abf4bcba..401c9395 100644
--- a/app/views/dashboard/incidents/add.blade.php
+++ b/app/views/dashboard/incidents/add.blade.php
@@ -14,7 +14,7 @@
         <div class="row">
             <div class="col-md-12">
                 @include('partials.dashboard.errors')
-                {{ Form::open(['name' => 'IncidentForm', 'class' => 'form-vertical', 'role' => 'form']) }}
+                {{ Form::open(['name' => 'IncidentForm', 'class' => 'form-horizontal', 'role' => 'form']) }}
                     <fieldset>
                         @if($incidentTemplates->count() > 0)
                         <div class="form-group">
@@ -90,8 +90,8 @@
 
                     <input type="hidden" name="incident[user_id]" value="{{ Auth::user()->id }}">
 
-                    <div class='form-group'>
-                        <div class='btn-group'>
+                    <div class="form-group">
+                        <div class="btn-group">
                             <button type="submit" class="btn btn-success">{{ trans('forms.add') }}</button>
                             <a class="btn btn-default" href="{{ route('dashboard.incidents') }}">{{ trans('forms.cancel') }}</a>
                         </div>
diff --git a/app/views/dashboard/incidents/edit.blade.php b/app/views/dashboard/incidents/edit.blade.php
index 5043129c..19c31d18 100644
--- a/app/views/dashboard/incidents/edit.blade.php
+++ b/app/views/dashboard/incidents/edit.blade.php
@@ -14,7 +14,7 @@
         <div class="row">
             <div class="col-md-12">
                 @include('partials.dashboard.errors')
-                {{ Form::open(['name' => 'IncidentForm', 'class' => 'form-vertical', 'role' => 'form']) }}
+                {{ Form::open(['name' => 'IncidentForm', 'class' => 'form-horizontal', 'role' => 'form']) }}
                     <fieldset>
                         <div class="form-group">
                             <label for="incident-name">{{ trans('forms.incidents.name') }}</label>
@@ -78,8 +78,8 @@
                     <input type="hidden" name="incident[user_id]" value="{{ Auth::user()->id }}">
                     <input type="hidden" name="incident[id]" value={{$incident->id}}>
 
-                    <div class='form-group'>
-                        <div class='btn-group'>
+                    <div class="form-group">
+                        <div class="btn-group">
                             <button type="submit" class="btn btn-success">{{ trans('forms.update') }}</button>
                             <a class="btn btn-default" href="{{ route('dashboard.incidents') }}">{{ trans('forms.cancel') }}</a>
                         </div>
diff --git a/app/views/dashboard/incidents/templates/add.blade.php b/app/views/dashboard/incidents/templates/add.blade.php
index d8fca19c..7387775b 100644
--- a/app/views/dashboard/incidents/templates/add.blade.php
+++ b/app/views/dashboard/incidents/templates/add.blade.php
@@ -14,7 +14,7 @@
         <div class="row">
             <div class="col-md-12">
                 @include('partials.dashboard.errors')
-                {{ Form::open(['name' => 'IncidentTemplateForm', 'class' => 'form-vertical', 'role' => 'form']) }}
+                {{ Form::open(['name' => 'IncidentTemplateForm', 'class' => 'form-horizontal', 'role' => 'form']) }}
                     <fieldset>
                         <div class="form-group">
                             <label for="template-name">{{ trans('forms.incidents.templates.name') }}</label>
@@ -28,7 +28,9 @@
                         </div>
                     </fieldset>
 
-                    <button type="submit" class="btn btn-success">{{ trans('forms.create') }}</button>
+                    <div class="form-group">
+                        <button type="submit" class="btn btn-success">{{ trans('forms.create') }}</button>
+                    </div>
                 {{ Form::close() }}
             </div>
         </div>
diff --git a/app/views/dashboard/incidents/templates/edit.blade.php b/app/views/dashboard/incidents/templates/edit.blade.php
index 5fa4c1a2..5d80dd80 100644
--- a/app/views/dashboard/incidents/templates/edit.blade.php
+++ b/app/views/dashboard/incidents/templates/edit.blade.php
@@ -23,7 +23,7 @@
                 </div>
                 @endif
 
-                {{ Form::open(['name' => 'IncidentTemplateForm', 'class' => 'form-vertical', 'role' => 'form']) }}
+                {{ Form::open(['name' => 'IncidentTemplateForm', 'class' => 'form-horizontal', 'role' => 'form']) }}
                     <fieldset>
                         <div class="form-group">
                             <label for="template-name">{{ trans('forms.incidents.templates.name') }}</label>
@@ -37,7 +37,9 @@
                         </div>
                     </fieldset>
 
-                    <button type="submit" class="btn btn-success">{{ trans('forms.update') }}</button>
+                    <div class="form-group">
+                        <button type="submit" class="btn btn-success">{{ trans('forms.update') }}</button>
+                    </div>
                 {{ Form::close() }}
             </div>
         </div>
diff --git a/app/views/dashboard/settings/app-setup.blade.php b/app/views/dashboard/settings/app-setup.blade.php
index 2a286649..a901046b 100644
--- a/app/views/dashboard/settings/app-setup.blade.php
+++ b/app/views/dashboard/settings/app-setup.blade.php
@@ -8,7 +8,7 @@
         <div class="content-wrapper">
             <div class="row">
                 <div class="col-sm-12">
-                    <form id="settings-form" name="SettingsForm" class="form-vertical" role="form" action="/dashboard/settings" method="POST" enctype="multipart/form-data">
+                    <form id="settings-form" name="SettingsForm" class="form-horizontal" role="form" action="/dashboard/settings" method="POST" enctype="multipart/form-data">
                         <h4 class="sub-header" id="application-setup">{{ trans('dashboard.settings.app-setup.app-setup') }}</h4>
                         @include('partials.dashboard.errors')
                         <fieldset>
diff --git a/app/views/dashboard/settings/security.blade.php b/app/views/dashboard/settings/security.blade.php
index 9d295bec..9c5967ce 100644
--- a/app/views/dashboard/settings/security.blade.php
+++ b/app/views/dashboard/settings/security.blade.php
@@ -8,7 +8,7 @@
         <div class="content-wrapper">
             <div class="row">
                 <div class="col-sm-12">
-                    <form name="SettingsForm" class="form-vertical" role="form" action="/dashboard/settings" method="POST">
+                    <form name="SettingsForm" class="form-horizontal" role="form" action="/dashboard/settings" method="POST">
                         <h4 class="sub-header" id="security">{{ trans('dashboard.settings.security.security') }}</h4>
                         @include('partials.dashboard.errors')
                         <fieldset>
diff --git a/app/views/dashboard/settings/stylesheet.blade.php b/app/views/dashboard/settings/stylesheet.blade.php
index 96c25ccc..f008e43c 100644
--- a/app/views/dashboard/settings/stylesheet.blade.php
+++ b/app/views/dashboard/settings/stylesheet.blade.php
@@ -8,7 +8,7 @@
         <div class="content-wrapper">
             <div class="row">
                 <div class="col-sm-12">
-                    <form name="SettingsForm" class="form-vertical" role="form" action="/dashboard/settings" method="POST">
+                    <form name="SettingsForm" class="form-horizontal" role="form" action="/dashboard/settings" method="POST">
                         <h4 class="sub-header" id="stylesheet">{{ trans('dashboard.settings.stylesheet.stylesheet') }}</h4>
                         @include('partials.dashboard.errors')
                         <fieldset>
diff --git a/app/views/dashboard/settings/theme.blade.php b/app/views/dashboard/settings/theme.blade.php
index e09e8a49..5d5f6ed2 100644
--- a/app/views/dashboard/settings/theme.blade.php
+++ b/app/views/dashboard/settings/theme.blade.php
@@ -8,7 +8,7 @@
         <div class="content-wrapper">
             <div class="row">
                 <div class="col-sm-12">
-                    <form name="SettingsForm" class="form-vertical" role="form" action="/dashboard/settings" method="POST">
+                    <form name="SettingsForm" class="form-horizontal" role="form" action="/dashboard/settings" method="POST">
                         <h4 class="sub-header" id="theme">{{ trans('dashboard.settings.theme.theme') }}</h4>
                         @include('partials.dashboard.errors')
                         <fieldset>
diff --git a/app/views/dashboard/team/add.blade.php b/app/views/dashboard/team/add.blade.php
index f717b932..676cd0a3 100644
--- a/app/views/dashboard/team/add.blade.php
+++ b/app/views/dashboard/team/add.blade.php
@@ -13,7 +13,7 @@
         <div class="row">
             <div class="col-sm-12">
                 @include('partials.dashboard.errors')
-                <form name="UserForm" class="form-vertical" role="form" action="/dashboard/team/add" method="POST">
+                <form name="UserForm" class="form-horizontal" role="form" action="/dashboard/team/add" method="POST">
                     <fieldset>
                         <div class="form-group">
                             <label>{{ trans('forms.user.username') }}</label>
@@ -29,7 +29,9 @@
                         </div>
                     </fieldset>
 
-                    <button type="submit" class="btn btn-success">{{ trans('forms.add') }}</button>
+                    <div class="form-group">
+                        <button type="submit" class="btn btn-success">{{ trans('forms.add') }}</button>
+                    </div>
                 </form>
             </div>
         </div>
diff --git a/app/views/dashboard/team/edit.blade.php b/app/views/dashboard/team/edit.blade.php
index 541cdb03..ab6da427 100644
--- a/app/views/dashboard/team/edit.blade.php
+++ b/app/views/dashboard/team/edit.blade.php
@@ -13,7 +13,7 @@
         <div class="row">
             <div class="col-sm-12">
                 @include('partials.dashboard.errors')
-                <form name="UserForm" class="form-vertical" role="form" action="/dashboard/team/{{ $user->id }}" method="POST">
+                <form name="UserForm" class="form-horizontal" role="form" action="/dashboard/team/{{ $user->id }}" method="POST">
                     <fieldset>
                         <div class="form-group">
                             <label>{{ trans('forms.user.username') }}</label>
@@ -29,10 +29,12 @@
                         </div>
                     </fieldset>
 
-                    <button type="submit" class="btn btn-success">{{ trans('forms.update') }}</button>
-                    @if(Auth::user()->isAdmin)
-                    <a class="btn btn-danger" href="/dashboard/user/{{ $user->id }}/api/regen">{{ trans('cachet.api.revoke') }}</a>
-                    @endif
+                    <div class="form-group">
+                        <button type="submit" class="btn btn-success">{{ trans('forms.update') }}</button>
+                        @if(Auth::user()->isAdmin)
+                        <a class="btn btn-danger" href="/dashboard/user/{{ $user->id }}/api/regen">{{ trans('cachet.api.revoke') }}</a>
+                        @endif
+                    </div>
                 </form>
             </div>
         </div>
diff --git a/app/views/dashboard/user/index.blade.php b/app/views/dashboard/user/index.blade.php
index f776afdb..1818ca7a 100644
--- a/app/views/dashboard/user/index.blade.php
+++ b/app/views/dashboard/user/index.blade.php
@@ -13,7 +13,7 @@
         <div class="row">
             <div class="col-sm-12">
                 @include('partials.dashboard.errors')
-                <form name="UserForm" class="form-vertical" role="form" action="/dashboard/user" method="POST">
+                <form name="UserForm" class="form-horizontal" role="form" action="/dashboard/user" method="POST">
                     <fieldset>
                         <div class="form-group">
                             <label>{{ trans('forms.user.username') }}</label>
@@ -56,8 +56,10 @@
                         @endif
                     </fieldset>
 
-                    <button type="submit" class="btn btn-success">{{ trans('forms.update') }}</button>
-                    <a href="/dashboard/user/{{ Auth::user()->id }}/api/regen" class="btn btn-warning">{{ trans('cachet.api.regenerate') }}</a>
+                    <div class="form-group">
+                        <button type="submit" class="btn btn-success">{{ trans('forms.update') }}</button>
+                        <a href="/dashboard/user/{{ Auth::user()->id }}/api/regen" class="btn btn-warning">{{ trans('cachet.api.regenerate') }}</a>
+                    </div>
                 </form>
             </div>
         </div>
diff --git a/app/views/setup.blade.php b/app/views/setup.blade.php
index 3c1ad992..4b1c81b8 100644
--- a/app/views/setup.blade.php
+++ b/app/views/setup.blade.php
@@ -23,7 +23,7 @@
                 </div>
             </div>
             <div class="clearfix"></div>
-            {{ Form::open(['name' => 'SetupForm', 'class' => 'form-vertical', 'id' => 'setup-form', 'role' => 'form', 'method' => 'POST']) }}
+            {{ Form::open(['name' => 'SetupForm', 'class' => 'form-horizontal', 'id' => 'setup-form', 'role' => 'form', 'method' => 'POST']) }}
                 <div class="step block-1 show">
                     <fieldset>
                         <div class="form-group">