diff --git a/resources/views/admin/aircraft/fields.blade.php b/resources/views/admin/aircraft/fields.blade.php
index b01e439d..373f59b2 100644
--- a/resources/views/admin/aircraft/fields.blade.php
+++ b/resources/views/admin/aircraft/fields.blade.php
@@ -44,7 +44,7 @@
     <!-- Submit Field -->
     <div class="form-group col-sm-12">
         <div class="pull-right">
-            {!! Form::submit('Save', ['class' => 'btn btn-primary']) !!}
+            {!! Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) !!}
             <a href="{!! route('admin.aircraft.index') !!}" class="btn btn-default">Cancel</a>
         </div>
     </div>
diff --git a/resources/views/admin/airlines/fields.blade.php b/resources/views/admin/airlines/fields.blade.php
index 97cfcf1e..54f11fb3 100644
--- a/resources/views/admin/airlines/fields.blade.php
+++ b/resources/views/admin/airlines/fields.blade.php
@@ -38,7 +38,7 @@
     <!-- Submit Field -->
     <div class="form-group col-sm-12">
         <div class="pull-right">
-            {!! Form::submit('Save', ['class' => 'btn btn-primary']) !!}
+            {!! Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) !!}
             <a href="{!! route('admin.airlines.index') !!}" class="btn btn-default">Cancel</a>
         </div>
     </div>
diff --git a/resources/views/admin/airports/fields.blade.php b/resources/views/admin/airports/fields.blade.php
index f07f59a0..a4929644 100644
--- a/resources/views/admin/airports/fields.blade.php
+++ b/resources/views/admin/airports/fields.blade.php
@@ -61,7 +61,7 @@
         <!-- Submit Field -->
         <div class="form-group col-sm-8">
             <div class="text-right">
-                {!! Form::submit('Save', ['class' => 'btn btn-primary']) !!}
+                {!! Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) !!}
                 <a href="{!! route('admin.airports.index') !!}" class="btn btn-default">Cancel</a>
             </div>
         </div>
diff --git a/resources/views/admin/fares/fields.blade.php b/resources/views/admin/fares/fields.blade.php
index 11d43508..a5a98ba4 100644
--- a/resources/views/admin/fares/fields.blade.php
+++ b/resources/views/admin/fares/fields.blade.php
@@ -74,8 +74,8 @@
 <!-- Submit Field -->
 <div class="form-group col-sm-12">
     <div class="pull-right">
-        {!! Form::submit('Save', ['class' => 'btn btn-primary']) !!}
-        <a href="{!! route('admin.fares.index') !!}" class="btn btn-default">Cancel</a>
+        {!! Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) !!}
+        <a href="{!! route('admin.fares.index') !!}" class="btn btn-warn">Cancel</a>
     </div>
 </div>
 </div>
diff --git a/resources/views/admin/flights/fields.blade.php b/resources/views/admin/flights/fields.blade.php
index d3476581..f7f5f7f5 100644
--- a/resources/views/admin/flights/fields.blade.php
+++ b/resources/views/admin/flights/fields.blade.php
@@ -93,7 +93,7 @@ SAME ROW
     </div>
     <div class="col-8">
         <div class="text-right">
-            {!! Form::submit('Save', ['class' => 'btn btn-primary']) !!}
+            {!! Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) !!}
             <a href="{!! route('admin.flights.index') !!}" class="btn btn-default">Cancel</a>
         </div>
     </div>
diff --git a/resources/views/admin/pirepfields/fields.blade.php b/resources/views/admin/pirepfields/fields.blade.php
index 359d1219..4eff7bb7 100644
--- a/resources/views/admin/pirepfields/fields.blade.php
+++ b/resources/views/admin/pirepfields/fields.blade.php
@@ -14,7 +14,7 @@
 <div class="row">
     <!-- Submit Field -->
     <div class="form-group col-sm-12">
-        {!! Form::submit('Save', ['class' => 'btn btn-primary']) !!}
+        {!! Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) !!}
         <a href="{!! route('admin.pirepfields.index') !!}" class="btn btn-default">Cancel</a>
     </div>
 </div>
diff --git a/resources/views/admin/pireps/fields.blade.php b/resources/views/admin/pireps/fields.blade.php
index d9ed202e..4deadc1a 100644
--- a/resources/views/admin/pireps/fields.blade.php
+++ b/resources/views/admin/pireps/fields.blade.php
@@ -73,8 +73,8 @@
 <!-- Submit Field -->
     <div class="form-group col-sm-12">
         <div class="pull-right">
-            {!! Form::submit('Save', ['class' => 'btn btn-primary']) !!}
-            <a href="{!! route('admin.pireps.index') !!}" class="btn btn-default">Cancel</a>
+            {!! Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) !!}
+            <a href="{!! route('admin.pireps.index') !!}" class="btn btn-warn">Cancel</a>
         </div>
     </div>
 </div>
diff --git a/resources/views/admin/ranks/fields.blade.php b/resources/views/admin/ranks/fields.blade.php
index 0ede042a..52f61ea8 100644
--- a/resources/views/admin/ranks/fields.blade.php
+++ b/resources/views/admin/ranks/fields.blade.php
@@ -1,25 +1,25 @@
 <div class="row">
     <!-- Name Field -->
-    <div class="col-sm-6">
+    <div class="form-group col-sm-6">
         {!! Form::label('name', 'Name:') !!}
         {!! Form::text('name', null, ['class' => 'form-control']) !!}
     </div>
 
     <!-- Hours Field -->
-    <div class="col-sm-6">
+    <div class="form-group col-sm-6">
         {!! Form::label('hours', 'Hours:') !!}
         {!! Form::number('hours', null, ['class' => 'form-control']) !!}
     </div>
 </div>
 <div class="row">
-    <div class="col-md-12">
+    <div class="form-group col-md-12">
         {!! Form::label('image_link', 'Image Link:') !!}
         {!! Form::number('image_link', null, ['class' => 'form-control']) !!}
     </div>
 </div>
 <div class="row">
     <!-- Auto Approve Acars Field -->
-    <div class="col-sm-4 text-center">
+    <div class="form-group col-sm-4 text-center">
         <div class="checkbox">
             <label class="checkbox-inline">
                 {!! Form::hidden('auto_approve_acars', false) !!}
@@ -30,7 +30,7 @@
     </div>
 
     <!-- Auto Approve Manual Field -->
-    <div class="col-sm-4 text-center">
+    <div class="form-group col-sm-4 text-center">
         <div class="checkbox">
             <label class="checkbox-inline">
                 {!! Form::hidden('auto_approve_manual', false) !!}
@@ -41,7 +41,7 @@
     </div>
 
     <!-- Auto Promote Field -->
-    <div class="col-sm-4 text-center">
+    <div class="form-group col-sm-4 text-center">
         <div class="checkbox">
             <label class="checkbox-inline">
                 {!! Form::hidden('auto_promote', false) !!}
@@ -53,7 +53,6 @@
 </div>
 
 <div class="row">
-        <!-- Submit Field -->
     <div class="col-sm-12">
         <div class="text-right">
             {!! Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) !!}
diff --git a/resources/views/admin/settings/table.blade.php b/resources/views/admin/settings/table.blade.php
index 6405dbc6..36846fc7 100644
--- a/resources/views/admin/settings/table.blade.php
+++ b/resources/views/admin/settings/table.blade.php
@@ -40,7 +40,7 @@
 <div class="card">
     <div class="content">
         <div class="text-right">
-            {!! Form::submit('Save', ['class' => 'btn btn-primary']) !!}
+            {!! Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) !!}
             <a href="{!! route('admin.subfleets.index') !!}" class="btn btn-default">Cancel</a>
         </div>
     </div>
diff --git a/resources/views/admin/subfleets/fields.blade.php b/resources/views/admin/subfleets/fields.blade.php
index 356f4ce9..3205e144 100644
--- a/resources/views/admin/subfleets/fields.blade.php
+++ b/resources/views/admin/subfleets/fields.blade.php
@@ -21,7 +21,7 @@
 
     <div class="form-group col-sm-12">
         <div class="pull-right">
-            {!! Form::submit('Save', ['class' => 'btn btn-primary']) !!}
+            {!! Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) !!}
             <a href="{!! route('admin.subfleets.index') !!}" class="btn btn-default">Cancel</a>
         </div>
     </div>
diff --git a/resources/views/admin/users/fields.blade.php b/resources/views/admin/users/fields.blade.php
index 65018be3..4240839e 100644
--- a/resources/views/admin/users/fields.blade.php
+++ b/resources/views/admin/users/fields.blade.php
@@ -59,7 +59,7 @@
     <!-- Submit Field -->
     <div class="form-group col-sm-6">
         <div class="pull-right">
-            {!! Form::submit('Save', ['class' => 'btn btn-primary']) !!}
+            {!! Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) !!}
             <a href="{!! route('admin.users.index') !!}" class="btn btn-default">Cancel</a>
         </div>
     </div>