diff --git a/resources/views/layouts/edit-form.blade.php b/resources/views/layouts/edit-form.blade.php
index 75b1427e1..1e136ba4a 100644
--- a/resources/views/layouts/edit-form.blade.php
+++ b/resources/views/layouts/edit-form.blade.php
@@ -23,36 +23,38 @@
 
 <div class="row">
     <div class="col-md-8 col-md-offset-2">
+        <form id="create-form" class="form-horizontal" method="post" action="{{ (isset($formAction)) ? $formAction : \Request::url()  }}" autocomplete="off" role="form" enctype="multipart/form-data">
+
         <div class="box box-default">
             <div class="box-header with-border">
-            <h3 class="box-title">
+            <h3 class="box-title" style="min-height: 20px;">
             @if ($item->id)
             {{ $item->display_name }}
             @endif
             </h3>
+                <div class="box-tools pull-right">
                 @if (isset($helpText))
-                    <div class="box-tools pull-right">
-                        <button class="slideout-menu-toggle btn btn-box-tool btn-box-tool-lg" data-toggle="tooltip" title="Help"><i class="fa fa-question"></i></button>
-                    </div>
+                    <button class="slideout-menu-toggle btn btn-box-tool btn-box-tool-lg" data-toggle="tooltip" title="Help"><i class="fa fa-question"></i></button>
                 @endif
+                 @include('partials.forms.edit.submit-button')
+                </div>
             </div><!-- /.box-header -->
 
             <div class="box-body">
-                <form id="create-form" class="form-horizontal" method="post" action="{{ (isset($formAction)) ? $formAction : \Request::url()  }}" autocomplete="off" role="form" enctype="multipart/form-data">
 
                     @if ($item->id)
                     {{ method_field('PUT') }}
                     @endif
 
-
                     <!-- CSRF Token -->
                     {{ csrf_field() }}
                     @yield('inputFields')
                     @include('partials.forms.edit.submit')
-                </form>
+
             </div>
         </div>
     </div>
+    </form>
 
     @if ((isset($helpText)) && (isset($helpTitle)))
     <div class="slideout-menu">
diff --git a/resources/views/partials/forms/edit/submit-button.blade.php b/resources/views/partials/forms/edit/submit-button.blade.php
new file mode 100644
index 000000000..c51487c24
--- /dev/null
+++ b/resources/views/partials/forms/edit/submit-button.blade.php
@@ -0,0 +1,5 @@
+<button type="submit" class="btn btn-success pull-right">
+    <i class="fa fa-check icon-white"></i>
+    {{ trans('general.save') }}
+</button>
+
diff --git a/resources/views/partials/forms/edit/submit.blade.php b/resources/views/partials/forms/edit/submit.blade.php
index 20b934df1..e9c0f3e96 100644
--- a/resources/views/partials/forms/edit/submit.blade.php
+++ b/resources/views/partials/forms/edit/submit.blade.php
@@ -1,4 +1,7 @@
-<div class="box-footer text-right">
-    <a class="btn btn-link text-left" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
-    <button type="submit" class="btn btn-success"><i class="fa fa-check icon-white"></i> {{ trans('general.save') }}</button>
+<!-- partials/forms/edit/submit.blade.php -->
+
+<div class="box-footer">
+        <a class="btn btn-link pull-left" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
+        @include('partials.forms.edit.submit-button')
 </div>
+<!-- / partials/forms/edit/submit.blade.php -->