diff --git a/templates/admin/default/categories.html b/templates/admin/default/categories.html
index 549d52d23..e25b79f1e 100755
--- a/templates/admin/default/categories.html
+++ b/templates/admin/default/categories.html
@@ -100,7 +100,7 @@
 
                                      <td>
                                      {loop type="image" name="cat_image" source="category" source_id="$ID" limit="1" width="50" height="50" resize_mode="crop" backend_context="1"}
-                                       <a href="{url path='admin/catalog' category_id=$ID}" title="{intl l='Browse this category'}"><img class="img-thumbnail" src="{$IMAGE_URL}" alt="{$TITLE}" /></a>
+                                       <a href="{url path='admin/catalog' category_id=$OBJECT_ID}" title="{intl l='Browse this category'}"><img class="img-thumbnail" src="{$IMAGE_URL}" alt="{$TITLE}" /></a>
                                      {/loop}
                                      </td>
 
@@ -269,7 +269,7 @@
 
                              <td>
                              {loop type="image" name="cat_image" source="product" source_id="$ID" limit="1" width="50" height="50" resize_mode="crop" backend_context="1"}
-                               <a href="{url path='/admin/products/update' product_id=$ID}" title="{intl l='Edit this product'}">
+                               <a href="{url path='/admin/products/update' product_id=$OBJECT_ID}" title="{intl l='Edit this product'}">
                                  <img src="{$IMAGE_URL}" alt="{$TITLE}" />
                                </a>
                              {/loop}
diff --git a/templates/admin/default/customers.html b/templates/admin/default/customers.html
index 7da2815b9..81a60fdf3 100644
--- a/templates/admin/default/customers.html
+++ b/templates/admin/default/customers.html
@@ -44,10 +44,6 @@
                                             {intl l="customer ref"}
                                         </th>
 
-                                        <th class="object-title">
-                                            {intl l="company"}
-                                        </th>
-
                                         {module_include location='category_list_header'}
 
                                         <th>
@@ -81,10 +77,6 @@
                                         <tr>
                                             <td><a href="{url path="/admin/customer/update/{$ID}"}">{$REF}</a></td>
 
-                                            <td>
-                                                {$COMPANY}
-                                            </td>
-
                                             <td class="object-title">
                                                 {$FIRSTNAME} {$LASTNAME}
                                             </td>
@@ -98,7 +90,7 @@
                                             <td>
                                                 {$lastOrderCurrency} {$lastOrderAmount}
                                             </td>
-                                            <td>
+                                            <td class="actions">
                                                 <div class="btn-group">
 
                                                     {loop type="auth" name="can_change" role="ADMIN" resource="admin.customer" access="UPDATE"}
diff --git a/templates/admin/default/folders.html b/templates/admin/default/folders.html
index a81165dd1..5a7d9a175 100644
--- a/templates/admin/default/folders.html
+++ b/templates/admin/default/folders.html
@@ -105,7 +105,7 @@
 
                                     <td>
                                         {loop type="image" name="folder_image" source="folder" source_id="$ID" limit="1" width="50" height="50" resize_mode="crop" backend_context="1"}
-                                            <a href="{url path='admin/folders' parent=$ID}" title="{intl l='Browse this folder'}"><img class="img-thumbnail" src="{$IMAGE_URL}" alt="{$TITLE}" /></a>
+                                            <a href="{url path='admin/folders' parent=$OBJECT_ID}" title="{intl l='Browse this folder'}"><img class="img-thumbnail" src="{$IMAGE_URL}" alt="{$TITLE}" /></a>
                                         {/loop}
                                     </td>
 
@@ -264,7 +264,7 @@
 
                                     <td>
                                         {loop type="image" name="folder_image" source="content" source_id="$ID" limit="1" width="50" height="50" resize_mode="crop" backend_context="1"}
-                                            <a href="{url path="admin/content/update/$ID"}" title="{intl l='Edit this content'}">
+                                            <a href="{url path="admin/content/update/$OBJECT_ID"}" title="{intl l='Edit this content'}">
                                                 <img src="{$IMAGE_URL}" alt="{$TITLE}" />
                                             </a>
                                         {/loop}