diff --git a/resources/views/layouts/edit-form.blade.php b/resources/views/layouts/edit-form.blade.php
index cb17931031..791590141c 100644
--- a/resources/views/layouts/edit-form.blade.php
+++ b/resources/views/layouts/edit-form.blade.php
@@ -31,35 +31,34 @@
         <!-- box -->
         <div class="box box-default">
             <!-- box-header -->
-            <div class="box-header with-border text-right">
+            <div class="box-header with-border">
+
+                @if ((isset($topSubmit) && ($topSubmit=='true')) || (isset($item->id)))
 
                 <div class="col-md-12 box-title text-right" style="padding: 0px; margin: 0px;">
-
-                    <div class="col-md-12" style="padding: 0px; margin: 0px;">
                         <div class="col-md-9 text-left">
                             @if ($item->id)
-                                <h2 class="box-title text-left" style="padding-top: 8px;">
+                                <h2 class="box-title" style="padding-top: 8px; padding-bottom: 7px;">
                                     {{ $item->display_name }}
                                 </h2>
                             @endif
                         </div>
+                        @if (isset($topSubmit) && ($topSubmit=='true'))
                         <div class="col-md-3 text-right" style="padding-right: 10px;">
-                            <a class="btn btn-link text-left" href="{{ URL::previous() }}">
-                                {{ trans('button.cancel') }}
-                            </a>
-                            <button type="submit" class="btn btn-primary">
+                            <button type="submit" class="btn btn-primary pull-right">
                                 <i class="fas fa-check icon-white" aria-hidden="true"></i>
                                 {{ trans('general.save') }}
                             </button>
                         </div>
-                    </div>
+                        @endif
                 </div>
-
             </div><!-- /.box-header -->
+            @endif
 
             <!-- box-body -->
             <div class="box-body">
 
+                <div style="padding-top: 30px;">
                     @if ($item->id)
                     {{ method_field('PUT') }}
                     @endif
@@ -68,6 +67,7 @@
                     {{ csrf_field() }}
                     @yield('inputFields')
                     @include('partials.forms.edit.submit')
+                </div>
 
             </div> <!-- ./box-body -->
         </div> <!-- box -->
diff --git a/resources/views/partials/forms/edit/submit.blade.php b/resources/views/partials/forms/edit/submit.blade.php
index 54f17e854c..4c87c7bb21 100644
--- a/resources/views/partials/forms/edit/submit.blade.php
+++ b/resources/views/partials/forms/edit/submit.blade.php
@@ -1,7 +1,7 @@
 <!-- partials/forms/edit/submit.blade.php -->
 
-<div class="box-footer text-right">
-    <a class="btn btn-link text-left" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
+<div class="box-footer text-right" style="padding-bottom: 0px;">
+    <a class="btn btn-link pull-left" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
     <button type="submit" accesskey="s" class="btn btn-primary"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
 </div>
 <!-- / partials/forms/edit/submit.blade.php -->