diff --git a/src/admin/dbmappings.php b/src/admin/dbmappings.php
index b3c1e11..43ee812 100644
--- a/src/admin/dbmappings.php
+++ b/src/admin/dbmappings.php
@@ -351,6 +351,9 @@ if ( isset($_POST['op']) )
 				array_splice($content['SUBMAPPINGS'], $iArrayNum-1, 0, $EntryTwoMove);
 			}
 			// --- 
+
+			// Add Focus to MoveUp Button again
+			AddWindowLoadFocus("subop_moveup_" . $szColId); 
 		}
 		else if ( isset($_POST['subop_movedown']) )
 		{
@@ -381,6 +384,9 @@ if ( isset($_POST['op']) )
 				array_splice($content['SUBMAPPINGS'], $iArrayNum+1, 0, $EntryTwoMove);
 			}
 			// --- 
+
+			// Add Focus to MoveDown Button again
+			AddWindowLoadFocus("subop_movedown_" . $szColId); 
 		}
 		else // Now SUBOP means normal processing!
 		{
diff --git a/src/admin/views.php b/src/admin/views.php
index 0a50e50..c8b9b3c 100644
--- a/src/admin/views.php
+++ b/src/admin/views.php
@@ -446,6 +446,9 @@ if ( isset($_POST['op']) )
 				array_splice($content['SUBCOLUMNS'], $iArrayNum-1, 0, $EntryTwoMove);
 			}
 			// --- 
+			
+			// Add Focus to MoveUp Button again
+			AddWindowLoadFocus("subop_moveup_" . $szColId); 
 		}
 		else if ( isset($_POST['subop_movedown']) )
 		{
@@ -476,6 +479,9 @@ if ( isset($_POST['op']) )
 				array_splice($content['SUBCOLUMNS'], $iArrayNum+1, 0, $EntryTwoMove);
 			}
 			// --- 
+
+			// Add Focus to MoveDown Button again
+			AddWindowLoadFocus("subop_movedown_" . $szColId); 
 		}
 		else // Now SUBOP means normal processing!
 		{
diff --git a/src/templates/admin/admin_dbmappings.html b/src/templates/admin/admin_dbmappings.html
index f7c6e71..56414f4 100644
--- a/src/templates/admin/admin_dbmappings.html
+++ b/src/templates/admin/admin_dbmappings.html
@@ -90,10 +90,10 @@
 				</td>
 				
 				<td align="center" class="{colcssclass}" width="20%">
-					<button name="subop_edit" type="submit" value="{MappingFieldID}" class="borderlessbuttons" title="{LN_DBMP_MAPPING_EDIT}"><img src="{MENU_EDIT}" width="16" alt="{LN_DBMP_MAPPING_EDIT}"></button>
-					<button name="subop_moveup" type="submit" value="{MappingFieldID}" class="borderlessbuttons" title="{LN_DBMP_MAPPING_MOVEUP}"><img src="{MENU_MOVE_UP}" width="16" alt="{LN_DBMP_MAPPING_REMOVE}"></button>
-					<button name="subop_movedown" type="submit" value="{MappingFieldID}" class="borderlessbuttons" title="{LN_DBMP_MAPPING_MOVEDOWN}"><img src="{MENU_MOVE_DOWN}" width="16" alt="{LN_DBMP_MAPPING_REMOVE}"></button>
-					<button name="subop_delete" type="submit" value="{MappingFieldID}" class="borderlessbuttons" title="{LN_DBMP_MAPPING_REMOVE}"><img src="{MENU_DELETE}" width="16" alt="{LN_DBMP_MAPPING_REMOVE}"></button>
+					<button name="subop_edit" id="subop_edit_{MappingFieldID}" type="submit" value="{MappingFieldID}" class="borderlessbuttons" title="{LN_DBMP_MAPPING_EDIT}"><img src="{MENU_EDIT}" width="16" alt="{LN_DBMP_MAPPING_EDIT}"></button>
+					<button name="subop_moveup" id="subop_moveup_{MappingFieldID}" type="submit" value="{MappingFieldID}" class="borderlessbuttons" title="{LN_DBMP_MAPPING_MOVEUP}"><img src="{MENU_MOVE_UP}" width="16" alt="{LN_DBMP_MAPPING_REMOVE}"></button>
+					<button name="subop_movedown" id="subop_movedown_{MappingFieldID}" type="submit" value="{MappingFieldID}" class="borderlessbuttons" title="{LN_DBMP_MAPPING_MOVEDOWN}"><img src="{MENU_MOVE_DOWN}" width="16" alt="{LN_DBMP_MAPPING_REMOVE}"></button>
+					<button name="subop_delete" id="subop_delete_{MappingFieldID}" type="submit" value="{MappingFieldID}" class="borderlessbuttons" title="{LN_DBMP_MAPPING_REMOVE}"><img src="{MENU_DELETE}" width="16" alt="{LN_DBMP_MAPPING_REMOVE}"></button>
 				</td>
 			</tr>
 			<!-- END SUBMAPPINGS -->
diff --git a/src/templates/admin/admin_views.html b/src/templates/admin/admin_views.html
index 8817416..039e1dd 100644
--- a/src/templates/admin/admin_views.html
+++ b/src/templates/admin/admin_views.html
@@ -108,13 +108,11 @@
 				</td>
 				
 				<td align="center" class="{colcssclass}" width="20%">
-					<button name="subop_moveup" type="submit" value="{ColFieldID}" class="borderlessbuttons" title="{LN_VIEWS_COLUMN_REMOVE}"><img src="{MENU_MOVE_UP}" width="16" alt="{LN_VIEWS_COLUMN_REMOVE}"></button>
-					<button name="subop_movedown" type="submit" value="{ColFieldID}" class="borderlessbuttons" title="{LN_VIEWS_COLUMN_REMOVE}"><img src="{MENU_MOVE_DOWN}" width="16" alt="{LN_VIEWS_COLUMN_REMOVE}"></button>
-					<button name="subop_delete" type="submit" value="{ColFieldID}" class="borderlessbuttons" title="{LN_VIEWS_COLUMN_REMOVE}"><img src="{MENU_DELETE}" width="16" alt="{LN_VIEWS_COLUMN_REMOVE}"></button>
-					
+					<button name="subop_moveup" id="subop_moveup_{ColFieldID}" type="submit" value="{ColFieldID}" class="borderlessbuttons" title="{LN_VIEWS_COLUMN_REMOVE}"><img src="{MENU_MOVE_UP}" width="16" alt="{LN_VIEWS_COLUMN_REMOVE}"></button>
+					<button name="subop_movedown" id="subop_movedown_{ColFieldID}" type="submit" value="{ColFieldID}" class="borderlessbuttons" title="{LN_VIEWS_COLUMN_REMOVE}"><img src="{MENU_MOVE_DOWN}" width="16" alt="{LN_VIEWS_COLUMN_REMOVE}"></button>
+					<button name="subop_delete" id="subop_delete_{ColFieldID}" type="submit" value="{ColFieldID}" class="borderlessbuttons" title="{LN_VIEWS_COLUMN_REMOVE}"><img src="{MENU_DELETE}" width="16" alt="{LN_VIEWS_COLUMN_REMOVE}"></button>
 <!--					&nbsp;<input type="submit" style="background-image:url({MENU_DELETE}); background-repeat:no-repeat; background-position:center;" class="borderless" name="subop_delete" value="{ColFieldID}">
-					&nbsp;<input type="image" src="{MENU_DELETE}" alt="{LN_VIEWS_COLUMN_REMOVE}" class="borderless" width="16" name="subop_delete_{ColFieldID}">
--->
+					&nbsp;<input type="image" src="{MENU_DELETE}" alt="{LN_VIEWS_COLUMN_REMOVE}" class="borderless" width="16" name="subop_delete_{ColFieldID}">-->
 				</td>
 			</tr>
 			<!-- END SUBCOLUMNS -->