diff --git a/e107_admin/users.php b/e107_admin/users.php
index 5c47173c8..fe4746815 100644
--- a/e107_admin/users.php
+++ b/e107_admin/users.php
@@ -1268,7 +1268,7 @@ class users_admin_ui extends e_admin_ui
 				".USRLAN_120."
 			</td>
 			<td>
-				<a href='#set_class' class='e-expandit'>".USRLAN_120."</a>
+				<a href='#set_class' class='btn e-expandit'>".USRLAN_120."</a>
 				<div class='e-hideme' id='set_class'>
 				{$temp}
 				</div>
@@ -1281,7 +1281,7 @@ class users_admin_ui extends e_admin_ui
 		<tr>
 			<td>".USRLAN_35."</td>
 			<td>
-				<a href='#set_perms' class='e-expandit'>Set Permissions</a>
+				<a href='#set_perms' class='btn e-expandit'>Set Permissions</a>
 				<div class='e-hideme' id='set_perms'>
 		";
 			
diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php
index e8adba9b7..ef5ec8ee7 100644
--- a/e107_handlers/admin_ui.php
+++ b/e107_handlers/admin_ui.php
@@ -4899,7 +4899,7 @@ class e_admin_form_ui extends e_form
 				<fieldset class='e-filter'>
 					<legend class='e-hideme'>".LAN_LABEL_LABEL_SELECTED."</legend>
 					".$filter_pre."
-					<div class='left'>
+					<div class='left' style='margin-top:10px;margin-bottom:-10px'>
 						".$this->text('searchquery', $current_query[0], 50, $input_options)."
 						".$this->select_open('filter_options', array('class' => 'e-tip tbox select filter', 'id' => false, 'title'=>'Filter the results below'))."
 							".$this->option(LAN_FILTER_LABEL_DISPLAYALL, '')."
@@ -5040,8 +5040,9 @@ class e_admin_form_ui extends e_form
 			return '';
 		}
 		// TODO - core ui-batch-option class!!! REMOVE INLINE STYLE!
+		// XXX Quick Fix for styling - correct. 
 		$text = "
-			<div class='buttons-bar left'>
+			<div class='navbar navbar-inner left' style='padding-left:30px; padding-top:6px; margin-top:-20px;border-top:0px'>
          		<img src='".e_IMAGE_ABS."generic/branchbottom.gif' alt='' class='icon action' />
 				".$this->select_open('etrigger_batch', array('class' => 'tbox select batch e-autosubmit reset', 'id' => false))."
 					".$this->option(LAN_BATCH_LABEL_SELECTED, '')."
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 596d770d6..3e9372b3f 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -770,7 +770,7 @@ class e_form
 		
 		if(vartrue($options['generate']))
 		{
-			$addon .= '&nbsp;<a href="#" class="smalltext e-tip" id="Spn_PasswordGenerator" title="Generate a password">Generate</a> | <a class="smalltext e-tip" href="#" id="showPwd" title="Display the password">Show</a><br />';	
+			$addon .= '&nbsp;<a href="#" class="btn btn-small e-tip" id="Spn_PasswordGenerator" title="Generate a password">Generate</a> <a class="btn btn-small e-tip" href="#" id="showPwd" title="Display the password">Show</a><br />';	
 		}
 		
 		if(vartrue($options['strength']))
diff --git a/e107_themes/bootstrap/admin_style.css b/e107_themes/bootstrap/admin_style.css
index d09b7dd58..c5bb388fa 100644
--- a/e107_themes/bootstrap/admin_style.css
+++ b/e107_themes/bootstrap/admin_style.css
@@ -3,7 +3,7 @@
 body 						{ padding-top: 75px; padding-bottom: 40px; }
       	
 .well 						{ padding:10px; }
-.navbar 					{ background-color: #081D28; }
+.navbar 					{  }
 
 #core-infopanel_mye107 a 	{}