diff --git a/resources/views/modals/model.blade.php b/resources/views/modals/model.blade.php
index abbd50ee9..92823c8b9 100644
--- a/resources/views/modals/model.blade.php
+++ b/resources/views/modals/model.blade.php
@@ -22,27 +22,12 @@
                     </div>
                 </div>
 
-                <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-manufacturer_id">{{ trans('general.manufacturer') }}:
-                        </label></div>
-                    <div class="col-md-8 col-xs-12">
-                        <select class="js-data-ajax" data-endpoint="manufacturers" name="manufacturer_id" style="width: 100%" id="modal-manufacturer_id"></select>
-                    </div>
-                </div>
 
-                <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-modelno">{{ trans('general.model_no') }}:</label></div>
-                    <div class="col-md-8 col-xs-12"><input type='text' name="model_number" id='modal-model_number' class="form-control"></div>
-                </div>
-
-                <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-fieldset_id">{{ trans('admin/models/general.fieldset') }}:</label></div>
-                    <div class="col-md-8 col-xs-12">{{ Form::select('fieldset_id', Helper::customFieldsetList(),old('fieldset_id'), array('class'=>'select2', 'id'=>'modal-fieldset_id', 'style'=>'width:350px')) }}</div>
-                </div>
-        </div>
-        <div class="modal-footer">
-            <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button>
-            <button type="button" class="btn btn-primary" id="modal-save">{{ trans('general.save') }}</button>
+                @include('modals.partials.manufacturer-select')
+                @include('modals.partials.model-number')
+                @include('modals.partials.fieldset-select')
+            </form>
         </div>
+       @include('modals.partials.footer')
     </div><!-- /.modal-content -->
 </div><!-- /.modal-dialog -->
diff --git a/resources/views/modals/partials/fieldset-select.blade.php b/resources/views/modals/partials/fieldset-select.blade.php
new file mode 100644
index 000000000..dbebedef2
--- /dev/null
+++ b/resources/views/modals/partials/fieldset-select.blade.php
@@ -0,0 +1,6 @@
+<!-- partials/modals/partials/fieldset-select.blade.php -->
+<div class="dynamic-form-row">
+    <div class="col-md-4 col-xs-12"><label for="modal-fieldset_id">{{ trans('admin/models/general.fieldset') }}:</label></div>
+    <div class="col-md-8 col-xs-12">{{ Form::select('fieldset_id', Helper::customFieldsetList(),old('fieldset_id'), array('class'=>'select2', 'id'=>'modal-fieldset_id', 'style'=>'width:350px')) }}</div>
+</div>
+<!-- partials/modals/partials/fieldset-select.blade.php -->
\ No newline at end of file
diff --git a/resources/views/modals/partials/footer.blade.php b/resources/views/modals/partials/footer.blade.php
new file mode 100644
index 000000000..354d189b9
--- /dev/null
+++ b/resources/views/modals/partials/footer.blade.php
@@ -0,0 +1,6 @@
+<!-- partials/modals/partials/footer.blade.php -->
+<div class="modal-footer">
+    <button type="button" class="btn btn-default pull-left" data-dismiss="modal">{{ trans('button.cancel') }}</button>
+    <button type="button" class="btn btn-primary pull-right" id="modal-save">{{ trans('general.save') }}</button>
+</div>
+<!-- partials/modals/partials/footer.blade.php -->
\ No newline at end of file
diff --git a/resources/views/modals/partials/manufacturer-select.blade.php b/resources/views/modals/partials/manufacturer-select.blade.php
new file mode 100644
index 000000000..3472e5984
--- /dev/null
+++ b/resources/views/modals/partials/manufacturer-select.blade.php
@@ -0,0 +1,9 @@
+<!-- partials/modals/partials/model-number.blade.php -->
+<div class="dynamic-form-row">
+    <div class="col-md-4 col-xs-12"><label for="modal-manufacturer_id">{{ trans('general.manufacturer') }}:
+        </label></div>
+    <div class="col-md-8 col-xs-12">
+        <select class="js-data-ajax" data-endpoint="manufacturers" name="manufacturer_id" style="width: 100%" id="modal-manufacturer_id"></select>
+    </div>
+</div>
+<!-- partials/modals/partials/model-number.blade.php -->
\ No newline at end of file
diff --git a/resources/views/modals/partials/model-number.blade.php b/resources/views/modals/partials/model-number.blade.php
new file mode 100644
index 000000000..2691f30d4
--- /dev/null
+++ b/resources/views/modals/partials/model-number.blade.php
@@ -0,0 +1,6 @@
+<!-- partials/modals/partials/model-number.blade.php -->
+<div class="dynamic-form-row">
+    <div class="col-md-4 col-xs-12"><label for="modal-modelno">{{ trans('general.model_no') }}:</label></div>
+    <div class="col-md-8 col-xs-12"><input type='text' name="model_number" id='modal-model_number' class="form-control"></div>
+</div>
+<!-- partials/modals/partials/model-number.blade.php -->
\ No newline at end of file
diff --git a/resources/views/modals/user.blade.php b/resources/views/modals/user.blade.php
index e65fcca5b..01c609333 100644
--- a/resources/views/modals/user.blade.php
+++ b/resources/views/modals/user.blade.php
@@ -96,8 +96,8 @@
                 </form>
             </div>
         <div class="modal-footer">
-            <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button>
-            <button type="button" class="btn btn-primary" id="modal-save">{{ trans('general.save') }}</button>
+            <button type="button" class="btn btn-default pull-left" data-dismiss="modal">{{ trans('button.cancel') }}</button>
+            <button type="button" class="btn btn-primary pull-right" id="modal-save">{{ trans('general.save') }}</button>
         </div>
     </div><!-- /.modal-content -->
 </div><!-- /.modal-dialog -->