diff --git a/app/views/admin/equipment/_item.rhtml b/app/views/admin/equipment/_item.rhtml
index 587f0ec..d707b80 100644
--- a/app/views/admin/equipment/_item.rhtml
+++ b/app/views/admin/equipment/_item.rhtml
@@ -3,7 +3,14 @@
 <tr>
 	<td><%= link_to (image_tag('image_icon.png'), admin_equipment_full_image_url(:id=>item, :format=>"jpg")) if item.has_image?%></td>
     <td><%=item.inventory_identifier%>
-    <td><%= link_to item.name, :action=>'show', :id=>item %></td>
+	
+	<% if current_person.administrator? %>
+    <td><%= link_to item.name, :controller=>'admin/equipment',:action=>'show', :id=>item %></td>
+	<% else -%>
+	<td><%= link_to item.name, :controller=>'equipment',:action=>'show', :id=>item %></td>
+    
+	<% end -%>
+
     <td><%if item.active_transfer %><%=item.active_transfer.transfer_to.display_name%><%end%></td>
     <td><!--%= link_to "transfer", {:controller=>'admin/transfers', :action=>'new', 'transfer[equipment_id]'=>item.id} %-->
 	
diff --git a/app/views/admin/transfers/_transfer_to.html.erb b/app/views/admin/transfers/_transfer_to.html.erb
index 52e1ed2..5a5c0cb 100644
--- a/app/views/admin/transfers/_transfer_to.html.erb
+++ b/app/views/admin/transfers/_transfer_to.html.erb
@@ -1,5 +1,5 @@
 	
-	<%= if transfer_to.transfer_to_type == "Location" then "Now In" else "Now With" end %>:
+	<%= if transfer_to.transfer_to_type == "Location" then "Currently In" else "Currently With" end %>:
 		<span class="transfer_name">
 		<%= transfer_to.transfer_to.name %>
 		</span>