diff --git a/e107_admin/users.php b/e107_admin/users.php
index 2a8cd4410..a24d37c80 100644
--- a/e107_admin/users.php
+++ b/e107_admin/users.php
@@ -174,7 +174,7 @@ class users_admin_ui extends e_admin_ui
 	//protected $editQry = "SELECT * FROM #users WHERE comment_id = {ID}";
 	
 	protected $pid 			= "user_id";
-	protected $perPage 		= 30;
+	protected $perPage 		= 10;
 	protected $batchDelete 	= true;
 	protected $listOrder 	= 'user_id DESC'; 
 	
diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php
index 42cb4df1c..153236383 100644
--- a/e107_handlers/admin_ui.php
+++ b/e107_handlers/admin_ui.php
@@ -1426,6 +1426,7 @@ class e_admin_dispatcher
 	 */
 	function renderMenu()
 	{
+		
 		$tp = e107::getParser();
 		$var = array();
 		$selected = false;
@@ -1498,6 +1499,32 @@ class e_admin_dispatcher
 		$selected = vartrue($this->adminMenuAliases[$selected], $selected);
 		return e107::getNav()->admin($this->menuTitle, $selected, $var);
 	}
+
+
+	/**
+	 * Render Help Text in <ul> format. XXX TODO
+	 */
+	function renderHelp()
+	{
+		
+		
+		
+	}
+
+	
+	/** 
+	 * Check for table issues and warn the user. XXX TODO 
+	 * ie. user is using French interface but no french tables found for the current DB tables. 
+	 */
+	function renderWarnings()
+	{
+		
+		
+		
+		
+	}
+	
+
 }
 
 class e_admin_controller
@@ -5364,9 +5391,12 @@ class e_admin_form_ui extends e_form
 						$parms['raw'] = true;
 						$val['writeParms'] = $parms;
 						$tmp = $this->renderElement($key, '', $val);
-						foreach ($tmp as $k => $name)
-						{
-							$option[$key.'__'.$k] = $name;
+						if(is_array($tmp))
+						{	
+							foreach ($tmp as $k => $name)
+							{
+								$option[$key.'__'.$k] = $name;
+							}
 						}
 					break;
 
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index ce8a5d4d6..904e7fb52 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -1296,34 +1296,34 @@ class e_form
 		{
 			case 'edit':
 				$image = ADMIN_EDIT_ICON_PATH;
-				$icon = "e-edit-16";
+				$icon = "e-edit-32";
 				$options['class'] = $options['class'] == 'action' ? 'action edit' : $options['class'];
 			break;
 
 			case 'delete':
 				$image = ADMIN_DELETE_ICON_PATH;
-				$icon = "e-delete-16";
+				$icon = "e-delete-32";
 				$options['class'] = $options['class'] == 'action' ? 'action delete' : $options['class'];
 				$options['other'] = 'data-confirm="'.LAN_JSCONFIRM.'"';
 			break;
 
 			case 'execute':
 				$image = ADMIN_EXECUTE_ICON_PATH;
-				$icon = "e-execute-16";
+				$icon = "e-execute-32";
 				$options['class'] = $options['class'] == 'action' ? 'action execute' : $options['class'];
 			break;
 
 			case 'view':
 				$image = ADMIN_VIEW_ICON_PATH;
-				$icon = "e-view-16";
+				$icon = "e-view-32";
 				$options['class'] = $options['class'] == 'action' ? 'action view' : $options['class'];
 			break;
 		}
 		$options['title'] = $title;//shorthand
 		
-	//	return  "<button type='submit' name='{$name}' data-placement='left' value='{$value}'".$this->get_attributes($options, $name, $value)."  ><i class='S16 {$icon}'></i></button>";
+		return  "<button type='submit' class='btn' data-toggle='tooltip' name='{$name}' data-placement='left' value='{$value}'".$this->get_attributes($options, $name, $value)."  ><i class='S32 {$icon}'></i></button>";
 
-		return "<input class='e-tip S16 {$icon}' data-placement='left' type='image' src='{$image}' name='{$name}' value='{$value}'".$this->get_attributes($options, $name, $value)." />";
+	//	return "<input class='e-tip S16 {$icon} btn btn-large' data-placement='left' type='image' src='{$image}' name='{$name}' value='{$value}'".$this->get_attributes($options, $name, $value)." />";
 	}
 
 	/**
@@ -2037,13 +2037,13 @@ class e_form
 					//$edit_query = array('mode' => varset($query['mode']), 'action' => varset($query['action']), 'id' => $id);
 					$query = http_build_query($query);
 					
-					$value = "";
+					$value = "<div class='btn-group'>";
 					
 					if(vartrue($parms['sort']))//FIXME use a global variable such as $fieldpref
 					{
 						$mode = preg_replace('/[^\w]/', '', vartrue($_GET['mode'], ''));
 						$from = intval(vartrue($_GET['from'],0));
-						$value .= "<a class='e-sort sort-trigger' style='display:inline-block;vertical-align:middle;cursor:move' href='".e_SELF."?mode={$mode}&action=sort&ajax_used=1&from={$from}' title='Re-order'>".ADMIN_SORT_ICON."</a> ";	
+						$value .= "<a class='e-sort sort-trigger btn ' style='cursor:move' href='".e_SELF."?mode={$mode}&action=sort&ajax_used=1&from={$from}' title='Re-order'>".ADMIN_SORT_ICON."</a> ";	
 					}	
 					
 					$cls = false;
@@ -2054,8 +2054,13 @@ class e_form
 					}	
 					if(false === $cls || check_class($cls))
 					{
-						$value .= "<a href='".e_SELF."?{$query}' class='e-tip' title='".LAN_EDIT."' data-placement='left'>
-						<img class='icon action edit list' src='".ADMIN_EDIT_ICON_PATH."' alt='".LAN_EDIT."' /></a>";
+						/*
+						$value .= "<a href='".e_SELF."?{$query}' class='e-tip btn btn-large' title='".LAN_EDIT."' data-placement='left'>
+												<img class='icon action edit list' src='".ADMIN_EDIT_ICON_PATH."' alt='".LAN_EDIT."' /></a>";
+												*/
+						
+						$value .= "<a href='".e_SELF."?{$query}' class='btn' title='".LAN_EDIT."' data-toggle='tooltip' data-placement='left'>
+						".ADMIN_EDIT_ICON."</a>";
 					}
 
 					$delcls = vartrue($attributes['noConfirm']) ? ' no-confirm' : '';
@@ -2064,15 +2069,16 @@ class e_form
 						$cls = (deftrue($parms['deleteClass'])) ? constant($parms['deleteClass']) : $parms['deleteClass'];
 						if(check_class($cls))
 						{
-							$value .= $this->submit_image('etrigger_delete['.$id.']', $id, 'delete', LAN_DELETE.' [ ID: '.$id.' ]', array('class' => 'action delete'.$delcls));
+							$value .= $this->submit_image('etrigger_delete['.$id.']', $id, 'delete', LAN_DELETE.' [ ID: '.$id.' ]', array('class' => 'action delete btn'.$delcls));
 						}
 					}
 					else
 					{
-						$value .= $this->submit_image('etrigger_delete['.$id.']', $id, 'delete', LAN_DELETE.' [ ID: '.$id.' ]', array('class' => 'action delete'.$delcls));
+						$value .= $this->submit_image('etrigger_delete['.$id.']', $id, 'delete', LAN_DELETE.' [ ID: '.$id.' ]', array('class' => 'action delete btn'.$delcls));
 					}
 				}
 				//$attributes['type'] = 'text';
+				$value .= "</div>";
 				return $value;
 			break;
 
diff --git a/e107_themes/bootstrap/admin_style.css b/e107_themes/bootstrap/admin_style.css
index 01de8c0c0..737375906 100644
--- a/e107_themes/bootstrap/admin_style.css
+++ b/e107_themes/bootstrap/admin_style.css
@@ -169,7 +169,7 @@ img.S32:hover 				{}
 /* Admin List Table */ 
 .adminlist, .adminform 						{ width:100%;  border:1px solid #ddd; background-color: #F6F6F6}
 .adminlist th 								{ border-bottom:1px solid #ddd;    }
-.adminlist td 								{ border-bottom:1px solid #ddd; border-right: 1px solid #ddd;  }
+.adminlist td 								{ border-bottom:1px solid #ddd }
 .adminlist th.last,
 .adminlist td.last 							{ border-right: 0px solid;}
 .adminlist tr.last td						{ border-bottom: 0px solid;}
diff --git a/e107_themes/bootstrap/admin_theme.php b/e107_themes/bootstrap/admin_theme.php
index cba25bd32..4fbabff4c 100644
--- a/e107_themes/bootstrap/admin_theme.php
+++ b/e107_themes/bootstrap/admin_theme.php
@@ -482,6 +482,7 @@ define("E_32_TRUE", "<i class='S32 e-true-32'></i>");
 
 
 	// FOR BC 
+
 	define("ADMIN_EDIT_ICON_PATH", e_IMAGE_ABS."admin_images/edit_32.png");
 	define("ADMIN_DELETE_ICON_PATH", e_IMAGE_ABS."admin_images/delete_32.png");
 	define("ADMIN_WARNING_ICON_PATH", e_IMAGE_ABS."admin_images/warning_32.png");
diff --git a/e107_web/js/core/admin.jquery.js b/e107_web/js/core/admin.jquery.js
index 49f537ffc..02a0407fc 100644
--- a/e107_web/js/core/admin.jquery.js
+++ b/e107_web/js/core/admin.jquery.js
@@ -80,7 +80,7 @@ $(document).ready(function()
 		
 		
 		// run tips on .field-help 
-		$("button,input,textarea,select,label,.e-tip").each(function(c) {
+		$("input,textarea,select,label,.e-tip").each(function(c) {
 						
 			var t = $(this).nextAll(".field-help");
 			t.hide();