diff --git a/lib/LIMS2/WebApp/Controller/User/PlateEdit.pm b/lib/LIMS2/WebApp/Controller/User/PlateEdit.pm
index 9fa09e52ee..9d3ac5a836 100644
--- a/lib/LIMS2/WebApp/Controller/User/PlateEdit.pm
+++ b/lib/LIMS2/WebApp/Controller/User/PlateEdit.pm
@@ -56,7 +56,7 @@ sub delete_plate :Path( '/user/delete_plate' ) :Args(0) {
             catch {
                 $c->flash->{error_msg} = 'Error encountered while deleting plate: ' . $_;
                 $c->model('Golgi')->txn_rollback;
-                $c->res->redirect( $c->uri_for('/user/edit_plate', { id => $params->{id} }) );
+                $c->res->redirect( $c->uri_for('/user/view_plate', { id => $params->{id} }) );
             };
         }
     );
@@ -69,7 +69,7 @@ sub rename_plate :Path( '/user/rename_plate' ) :Args(0) {
 
     unless ( $params->{new_name} ) {
         $c->flash->{error_msg} = 'You must specify a new plate name';
-        $c->res->redirect( $c->uri_for('/user/edit_plate', { id => $params->{id} }) );
+        $c->res->redirect( $c->uri_for('/user/view_plate', { id => $params->{id} }) );
         return;
     }
 
@@ -92,7 +92,7 @@ sub rename_plate :Path( '/user/rename_plate' ) :Args(0) {
         }
     );
 
-    $c->res->redirect( $c->uri_for('/user/edit_plate', { id => $params->{id} }) );
+    $c->res->redirect( $c->uri_for('/user/view_plate', { id => $params->{id} }) );
 }
 
 =head1 AUTHOR
diff --git a/root/site/user/browseplates/index.tt b/root/site/user/browseplates/index.tt
index 1ab0078d4a..c68e5078ca 100644
--- a/root/site/user/browseplates/index.tt
+++ b/root/site/user/browseplates/index.tt
@@ -36,11 +36,6 @@
       <td>
         <a href="[% c.uri_for( '/user/view_plate', { id => plate.id } ) %]">[% plate.name %]</a>
       </td>
-      <td>
-        <a class="btn btn-mini" href="[% c.uri_for('/user/edit_plate', { id => plate.id } ) %]">
-          <i class="icon-pencil"></i> Edit
-        </a>
-      </td>
       <td>[% plate.type_id %]</td>
       <td>[% plate.description %]</td>
       <td>[% plate.created_by.name %]</td>
diff --git a/root/site/user/browseplates/view.tt b/root/site/user/browseplates/view.tt
index 839b5e0523..40ac0f018c 100644
--- a/root/site/user/browseplates/view.tt
+++ b/root/site/user/browseplates/view.tt
@@ -1,47 +1,145 @@
-[%- META title="View Plate"; META tab_name = "Browse" %]
+[%- META title="View Plate"; META tab_name = "Plates" %]
 
 <div class="page-header">
   <h1>Plate <small>[% plate.name %]</small></h1>
 </div>
 
-<table class="table">
-  <thead>
-    <tr>
-      <th>Plate Name</th>
-      <th>Plate Type</th>
-      <th>Description</th>
-      <th>Created By</th>
-      <th>Created At</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>[% plate.name %]</td>
-      <td>[% plate.type.id %] ([% plate.type.description %])</td>
-      <td>[% plate.description %]</td>
-      <td>[% plate.created_by.name %]</td>
-      <td>[% plate.created_at.ymd %]</td>
-    </tr>
-  </tbody>
-</table>
-
-<h2>Comments</h2>
-[% IF plate.plate_comments.size %]
-<dl>
-  [% FOR comment IN plate.plate_comments %]
-  <dt>[% comment.created_by.name %], [% comment.created_at.ymd %]</dt>
-  <dd>
-    <p>[% comment.comment_text %]</p>
-  </dd>
-  [% END %]
-</dl>
-[% ELSE %]
-<p><em>No comments for this plate.</em></p>
-[% END %]
+<div class="row">
+  <div class="span6">
+      <table class="table">
+
+        <tr>
+          <td>
+            <strong>Name</strong>
+          </td>
+          <td>
+            [% plate.name %]
+          </td>
+          <td>
+            <a class="btn btn-primary" role="button" href="#RenamePlateModal" data-toggle="modal">
+              <i class="icon-pencil"></i> Rename
+            </a>
+          </td>
+        </tr>
+
+        <tr>
+          <td>
+            <strong>Type</strong>
+          </td>
+          <td>
+            [% plate.type.id %] ([% plate.type.description %])
+          </td>
+          <td></td>
+        </tr>
+
+        <tr>
+          <td>
+            <strong>Description</strong>
+          </td>
+          <td>
+            [% plate.description %]
+          </td>
+          <td></td>
+        </tr>
+
+        <tr>
+          <td>
+            <strong>Created By</strong>
+          </td>
+          <td>
+            [% plate.created_by.name %]
+          </td>
+          <td></td>
+        </tr>
+
+        <tr>
+          <td>
+            <strong>Created At</strong>
+          </td>
+          <td>
+            [% plate.created_at.ymd %]
+          </td>
+          <td></td>
+        </tr>
+
+      </table>
+
+  </div>
+
+  <div class="span6">
+    <div class="well">
+      <h2>Comments</h2>
+      [% IF plate.plate_comments.size %]
+      <dl>
+        [% FOR comment IN plate.plate_comments %]
+        <dt>[% comment.created_by.name %], [% comment.created_at.ymd %]</dt>
+        <dd>
+          <p>[% comment.comment_text %]</p>
+        </dd>
+        [% END %]
+      </dl>
+      [% ELSE %]
+      <p><em>No comments for this plate.</em></p>
+      [% END %]
+    </div>
+  </div>
+</div>
 
-<a class="btn" href="[% c.uri_for('/user/edit_plate', { id => plate.id } ) %]">
-  <i class="icon-pencil"></i> Edit Plate
-</a>
+
+<div class="modal hide fade" id="RenamePlateModal">
+  <form method="POST" id="plate_rename" action="[% c.uri_for( '/user/rename_plate' ) %]" class="modal-form"  enctype="multipart/form-data" >
+    <div class="modal-header">
+      <button type="button" class="close" data-dismiss="modal">×</button>
+      <h3 id="myModalLabel">Rename Plate</h3>
+    </div>
+
+    <div class="modal-body">
+      <input type="hidden" name="id" value="[% plate.id %]" />
+      <input type="hidden" name="name" value="[% plate.name %]" />
+      Rename plate from <strong>[% plate.name %]</strong> to <input name="new_name" id="new_name" type="text" />
+    </div>
+
+    <div class="modal-footer">
+      <button class="btn" data-dismiss="modal">Cancel</button>
+      <button name="plate_rename" id="plate_rename" type="submit" value="plate_rename" class="btn btn-primary">
+          <i class="icon-pencil"></i> Rename Plate
+      </button>
+    </div>
+  </form>
+</div>
+
+[% UNLESS plate.has_child_wells %]
+  <div class="row">
+    <div class="span2">
+      <a id="delete_plate_button" class="btn btn-danger" role="button" href="#DeletePlateModal" data-toggle="modal">
+        <i class="icon-remove icon-white"></i> Delete Plate
+      </a>
+    </div>
+  </div>
+  </br>
+
+  <div class="modal hide fade" id="DeletePlateModal">
+    <form method="POST" id="plate_delete" action="[% c.uri_for( '/user/delete_plate' ) %]" class="modal-form"  enctype="multipart/form-data" >
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal">×</button>
+        <h3 id="myModalLabel">Delete Plate</h3>
+      </div>
+
+      <div class="modal-body" align="center">
+        <input type="hidden" name="id" value="[% plate.id %]" />
+        <input type="hidden" name="name" value="[% plate.name %]" />
+        Are you sure you want to delete plate <strong>[% plate.name %]</strong>?
+      </div>
+
+      <div class="modal-footer">
+        <button class="btn" data-dismiss="modal">Cancel</button>
+        <button type="submit" value="delete_plate" class="btn btn-danger" id="delete_plate_button" >
+          <i class="icon-remove icon-white"></i> Confirm Delete Plate
+        </button>
+      </div>
+    </form>
+  </div>
+[% END %]
 
 <h2>Wells</h2>
 <a class="btn btn-primary" href="[% well_report_uri %]"><i class="icon-list icon-white"></i> Well Details</a>
diff --git a/root/site/user/plateedit/index.tt b/root/site/user/plateedit/index.tt
deleted file mode 100644
index 24e96d3ae6..0000000000
--- a/root/site/user/plateedit/index.tt
+++ /dev/null
@@ -1,143 +0,0 @@
-[%- META title="Edit Plate"; META tab_name = "Plates" %]
-
-<div class="page-header">
-  <h1>Plate <small>[% plate.name %]</small></h1>
-</div>
-
-
-<div class="row">
-  <div class="span6">
-      <table class="table">
-
-        <tr>
-          <td>
-            <strong>Name</strong>
-          </td>
-          <td>
-            [% plate.name %]
-          </td>
-          <td>
-            <a class="btn btn-primary" role="button" href="#RenamePlateModal" data-toggle="modal">
-              <i class="icon-pencil"></i> Rename
-            </a>
-          </td>
-        </tr>
-
-        <tr>
-          <td>
-            <strong>Type</strong>
-          </td>
-          <td>
-            [% plate.type.id %] ([% plate.type.description %])
-          </td>
-          <td></td>
-        </tr>
-
-        <tr>
-          <td>
-            <strong>Description</strong>
-          </td>
-          <td>
-            [% plate.description %]
-          </td>
-          <td></td>
-        </tr>
-
-        <tr>
-          <td>
-            <strong>Created By</strong>
-          </td>
-          <td>
-            [% plate.created_by.name %]
-          </td>
-          <td></td>
-        </tr>
-
-        <tr>
-          <td>
-            <strong>Created At</strong>
-          </td>
-          <td>
-            [% plate.created_at.ymd %]
-          </td>
-          <td></td>
-        </tr>
-
-      </table>
-
-  </div>
-
-  <div class="span6">
-    <div class="well">
-      <h2>Comments</h2>
-      [% IF plate.plate_comments.size %]
-      <dl>
-        [% FOR comment IN plate.plate_comments %]
-        <dt>[% comment.created_by.name %], [% comment.created_at.ymd %]</dt>
-        <dd>
-          <p>[% comment.comment_text %]</p>
-        </dd>
-        [% END %]
-      </dl>
-      [% ELSE %]
-      <p><em>No comments for this plate.</em></p>
-      [% END %]
-    </div>
-  </div>
-</div>
-
-<div class="modal hide fade" id="RenamePlateModal">
-  <form method="POST" id="plate_rename" action="[% c.uri_for( '/user/rename_plate' ) %]" class="modal-form"  enctype="multipart/form-data" >
-    <div class="modal-header">
-      <button type="button" class="close" data-dismiss="modal">×</button>
-      <h3 id="myModalLabel">Rename Plate</h3>
-    </div>
-
-    <div class="modal-body">
-      <input type="hidden" name="id" value="[% plate.id %]" />
-      <input type="hidden" name="name" value="[% plate.name %]" />
-      Rename plate from <strong>[% plate.name %]</strong> to <input name="new_name" id="new_name" type="text" />
-    </div>
-
-    <div class="modal-footer">
-      <button class="btn" data-dismiss="modal">Cancel</button>
-      <button name="plate_rename" id="plate_rename" type="submit" value="plate_rename" class="btn btn-primary">
-          <i class="icon-pencil"></i> Rename Plate
-      </button>
-    </div>
-  </form>
-</div>
-
-[% UNLESS plate.has_child_wells %]
-  <div class="row">
-    <div class="span2">
-      <a id="delete_plate_button" class="btn btn-danger" role="button" href="#DeletePlateModal" data-toggle="modal">
-        <i class="icon-remove icon-white"></i> Delete Plate
-      </a>
-    </div>
-  </div>
-  </br>
-
-  <div class="modal hide fade" id="DeletePlateModal">
-    <form method="POST" id="plate_delete" action="[% c.uri_for( '/user/delete_plate' ) %]" class="modal-form"  enctype="multipart/form-data" >
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal">×</button>
-        <h3 id="myModalLabel">Delete Plate</h3>
-      </div>
-
-      <div class="modal-body" align="center">
-        <input type="hidden" name="id" value="[% plate.id %]" />
-        <input type="hidden" name="name" value="[% plate.name %]" />
-        Are you sure you want to delete plate <strong>[% plate.name %]</strong>?
-      </div>
-
-      <div class="modal-footer">
-        <button class="btn" data-dismiss="modal">Cancel</button>
-        <button type="submit" value="delete_plate" class="btn btn-danger" id="delete_plate_button" >
-          <i class="icon-remove icon-white"></i> Confirm Delete Plate
-        </button>
-      </div>
-    </form>
-  </div>
-[% END %]
-
diff --git a/t/80-plate_edit.t b/t/80-plate_edit.t
index 0451e806d6..4dfbe3b21a 100644
--- a/t/80-plate_edit.t
+++ b/t/80-plate_edit.t
@@ -21,12 +21,12 @@ my $plate_with_children = model->retrieve_plate( { name => 'PCS00097_A' } );
 {
     note( "Visit plate edit page" );
 
-    $mech->get_ok( '/user/edit_plate?id=' . $plate_without_children->id );
-    $mech->title_is('Edit Plate');
+    $mech->get_ok( '/user/view_plate?id=' . $plate_without_children->id );
+    $mech->title_is('View Plate');
     $mech->content_like( qr/delete_plate_button/, '..has delete plate button');
 
-    $mech->get_ok( '/user/edit_plate?id=' . $plate_with_children->id );
-    $mech->title_is('Edit Plate');
+    $mech->get_ok( '/user/view_plate?id=' . $plate_with_children->id );
+    $mech->title_is('View Plate');
     $mech->content_unlike( qr/delete_plate_button/, '..has no delete plate button');
 }
 
@@ -35,11 +35,11 @@ my $plate_with_children = model->retrieve_plate( { name => 'PCS00097_A' } );
     my $plate = model->retrieve_plate( { name => 'SEP0006' } );
 
     $mech->get_ok( '/user/rename_plate?id=' . $plate->id . '&name=' . $plate->name . '&new_name=' . $plate_with_children->name );
-    $mech->base_like( qr{user/edit_plate},'...moves to edit_plates page');
+    $mech->base_like( qr{user/view_plate},'...moves to view_plates page');
     $mech->content_like( qr/Error encountered while renaming plate: .* already exists/, '...correct plate rename error message');
 
     $mech->get_ok( '/user/rename_plate?id=' . $plate->id . '&name=' . $plate->name . '&new_name=FOOBAR' );
-    $mech->base_like( qr{user/edit_plate},'...moves to browse_plates page');
+    $mech->base_like( qr{user/view_plate},'...moves to view_plate page');
     $mech->content_like( qr/Renamed plate from SEP0006 to FOOBAR/, '...correct plate rename message');
 }
 
@@ -51,7 +51,7 @@ my $plate_with_children = model->retrieve_plate( { name => 'PCS00097_A' } );
     $mech->content_like( qr/Deleted plate FFP0001/, '...correct plate delete message');
 
     $mech->get_ok( '/user/delete_plate?id=' . $plate_with_children->id . '&name=' . $plate_with_children->name );
-    $mech->base_like( qr{user/edit_plate},'...moves to edit_plate page');
+    $mech->base_like( qr{user/view_plate},'...moves to view_plate page');
     $mech->content_like( qr/Error encountered while deleting plate: .* has child plates/, '...correct delete plate error message');
 }