diff --git a/.travis.yml b/.travis.yml
index a10d765513..81c3b53d4c 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ env:
 
 # execute any number of scripts before the test run, custom env's are available as variables
 before_script:
-  - if [[ "$DB" == "mysql" ]]; then mysql -e "create database IF NOT EXISTS snipeit_laravel;" -utravis; fi
+  - if [[ "$DB" == "mysql" ]]; then mysql -e "create database IF NOT EXISTS snipeitdev;" -utravis; fi
   - curl -s http://getcomposer.org/installer | php
   - cp app/config/production/database.example.php app/config/database.php
   - cp app/config/production/mail.example.php app/config/mail.php
diff --git a/app/controllers/admin/ModelsController.php b/app/controllers/admin/ModelsController.php
index 3c75278f7a..65e7af9fb1 100644
--- a/app/controllers/admin/ModelsController.php
+++ b/app/controllers/admin/ModelsController.php
@@ -256,6 +256,7 @@ class ModelsController extends AdminController
         $view->with('depreciation_list',$depreciation_list);
         $view->with('manufacturer_list',$manufacturer_list);
         $view->with('model',$model);
+        $view->with('clone_model',$model_to_clone);
         return $view;
         
     }
diff --git a/app/views/backend/layouts/default.blade.php b/app/views/backend/layouts/default.blade.php
index 35dd8f78be..7c0b086e78 100644
--- a/app/views/backend/layouts/default.blade.php
+++ b/app/views/backend/layouts/default.blade.php
@@ -337,7 +337,7 @@
                   <div class="muted credit" style="position:absolute;margin-top:1px;left:80px;margin-right:100px;"><a target="_blank" href="http://snipeitapp.com">Snipe IT</a> is a free open source
                       project by <a target="_blank" href="http://twitter.com/snipeyhead">@snipeyhead</a>.</div>
                   <div class="muted credit" style="position:absolute;margin-top:1px;right:80px;margin-left:100px;"><a target="_blank" href="https://github.com/snipe/snipe-it">Fork it</a> | <a target="_blank" href="http://docs.snipeitapp.com/">Documentation</a> | 
-                      <a target="_blank" href="https://github.com/snipe/snipe-it/issues?state=open">Report a Bug</a> &nbsp; &nbsp; (alpha 0.4.1)</p>
+                      <a target="_blank" href="https://github.com/snipe/snipe-it/issues?state=open">Report a Bug</a> &nbsp; &nbsp; (alpha 0.4.2)</p>
                   </div>
                   </div>
         </div>
diff --git a/app/views/backend/models/edit.blade.php b/app/views/backend/models/edit.blade.php
index d32007408b..f0b34556f9 100644
--- a/app/views/backend/models/edit.blade.php
+++ b/app/views/backend/models/edit.blade.php
@@ -12,38 +12,19 @@
 
 {{-- Page content --}}
 @section('content')
-<!--<div class="row header">
-    <div class="col-md-12">
-            <a href="{{ URL::previous() }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i>  @lang('general.back')</a>
-        <h3>
-        @if ($model->id)
-            @lang('admin/models/table.update')
-        @else
-            @lang('admin/models/table.create')
-        @endif
-        </h3>
-    </div>
-</div>-->
-
 <div class="row header">
     <div class="col-md-12">
-        <div class="btn-group pull-right">
-            <button class="btn gray">@lang('button.actions')</button>
-            <button class="btn glow dropdown-toggle" data-toggle="dropdown">
-                <span class="caret"></span>
-            </button>
-            <ul class="dropdown-menu">    
-                
-                @if ($model->id)
-                    
-                    <li><a href="{{ route('clone/model', $model->id) }}">@lang('admin/models/table.clone')</a></li>                
-                @endif
-                    <li><a href="{{ URL::previous() }}">@lang('general.cancel')</a></li>
-            </ul>
-        </div>
+            <!--<a href="{{ URL::previous() }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i>  @lang('general.back')</a>-->
+        @if(isset($clone_model))
+            <a href="{{{ URL::route('view/model', $clone_model->id) }}}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i>  @lang('general.back')</a>
+        @else
+            <a href="{{{ URL::route('view/model', $model->id) }}}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i>  @lang('general.back')</a>
+        @endif
         <h3>
         @if ($model->id)
             @lang('admin/models/table.update')
+        @elseif(isset($clone_model))
+            @lang('admin/models/table.clone')
         @else
             @lang('admin/models/table.create')
         @endif
@@ -132,7 +113,11 @@
             <div class="form-group">
             <label class="col-md-2 control-label"></label>
                 <div class="col-md-7">
-                    <a class="btn btn-link" href="{{ URL::previous() }}">@lang('general.cancel')</a>
+                    @if(isset($clone_model))
+                        <a class="btn btn-link" href="{{ URL::route('view/model', $clone_model->id) }}">@lang('general.cancel')</a>
+                    @else
+                        <a class="btn btn-link" href="{{ URL::route('view/model', $model->id) }}">@lang('general.cancel')</a>
+                    @endif                    
                     <button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
                 </div>
             </div>
diff --git a/app/views/backend/models/view.blade.php b/app/views/backend/models/view.blade.php
index 79697d4880..767ecc76e0 100644
--- a/app/views/backend/models/view.blade.php
+++ b/app/views/backend/models/view.blade.php
@@ -10,13 +10,32 @@
 {{-- Page content --}}
 @section('content')
 
-<div class="row header">
+<!--<div class="row header">
     <div class="col-md-12">
         <a href="{{ route('update/model', $model->id) }}" class="btn btn-warning pull-right">
         @lang('admin/models/table.update')</a>
         <h3 class="name">@lang('general.history_for')
         {{{ $model->name }}} </h3>
     </div>
+</div>-->
+<div class="row header">
+    <div class="col-md-12">
+        <div class="btn-group pull-right">
+            <button class="btn gray">@lang('button.actions')</button>
+            <button class="btn glow dropdown-toggle" data-toggle="dropdown">
+                <span class="caret"></span>
+            </button>
+            <ul class="dropdown-menu">    
+                    <li><a href="{{ route('update/model', $model->id) }}">@lang('admin/models/table.edit')</a></li>  
+                    <li><a href="{{ route('clone/model', $model->id) }}">@lang('admin/models/table.clone')</a></li>    
+            </ul>
+        </div>
+        <h3>
+        
+            @lang('admin/models/table.view')        
+        
+        </h3>
+    </div>
 </div>
 
 <div class="user-profile">