diff --git a/e107_admin/header.php b/e107_admin/header.php
index ecb7bf312..73f7b6212 100644
--- a/e107_admin/header.php
+++ b/e107_admin/header.php
@@ -50,12 +50,8 @@ function loadJSAddons()
 // e107::js('core',    'bootstrap/js/bootstrap-modal.js', 'jquery', 2);  // Special Version see: https://github.com/twitter/bootstrap/pull/4224
 
  
-	e107::css('core', 	'bootstrap-editable/css/bootstrap-editable.css', 'jquery');
-	e107::js('core', 	'bootstrap-editable/js/bootstrap-editable.min.js', 'jquery', 2);
-	
-//	e107::css('url', 		"//cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/bootstrap-editable/css/bootstrap-editable.css");
-//	e107::js('url', 		"//cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/bootstrap-editable/js/bootstrap-editable.min.js");
-	
+
+
 	e107::css('core', 	'bootstrap-select/bootstrap-select.min.css', 'jquery');
 	e107::js('core', 	'bootstrap-select/bootstrap-select.min.js', 'jquery', 2);
 	
@@ -274,7 +270,7 @@ if (isset($eplug_css) && $eplug_css)
 
 
 
-	if(e107::getPref('admincss') == "admin_dark.css" && !vartrue($_GET['configure']) && !deftrue('e_BOOTSTRAP3_ADMIN'))
+	if(e107::getPref('admincss') == "admin_dark.css" && !vartrue($_GET['configure']) && e107::getPref('admintheme')!='bootstrap3')
 	{
 	
 		$e_js->coreCSS('bootstrap/css/darkstrap.css');
diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php
index 65cf760aa..9f4c81888 100644
--- a/e107_handlers/admin_ui.php
+++ b/e107_handlers/admin_ui.php
@@ -5646,11 +5646,11 @@ class e_admin_form_ui extends e_form
 		{
 			if(empty($tabs))
 			{
-				$head = "<div class='text-right' style='margin-top:-10px;padding-bottom:5px;padding-right:5px'>".$multiLangInfo."</div>";
+				$head = "<div id='admin-ui-edit-db-language' class='text-right'>".$multiLangInfo."</div>";
 			}
 			else
 			{
-				$head = "<div class='text-right' style='margin-bottom:-30px;padding-top:10px;padding-right:5px'>".$multiLangInfo."</div>";
+				$head = "<div id='admin-ui-edit-db-language' class='text-right'>".$multiLangInfo."</div>";
 			}
 		}
 		else
@@ -5897,13 +5897,13 @@ class e_admin_form_ui extends e_form
 		}
 		$text = "
 			<form method='get' action='".e_SELF."'>
-				<fieldset class='e-filter'>
+				<fieldset id='admin-ui-list-filter' class='e-filter'>
 					<legend class='e-hideme'>".LAN_LABEL_LABEL_SELECTED."</legend>
 					".$filter_pre."
-					<div class='row-fluid'>
-						<div class='left form-inline span8 col-md-8' style='margin-top:10px;margin-bottom:-10px;'>
+					<div  class='row-fluid'>
+						<div  class='left form-inline span8 col-md-8' >
 							".$this->text('searchquery', $current_query[0], 50, $input_options)."<i class='fa fa-search searchquery'></i>
-							".$this->select_open('filter_options', array('class' => 'e-tip tbox select filter', 'id' => false, 'title'=>'Filter the results below'))."
+							".$this->select_open('filter_options', array('class' => 'form-control e-tip tbox select filter', 'id' => false, 'title'=>'Filter the results below'))."
 								".$this->option(LAN_FILTER_LABEL_DISPLAYALL, '')."
 								".$this->option(LAN_FILTER_LABEL_CLEAR, '___reset___')."
 								".$this->renderBatchFilter('filter', $current_query[1])."
@@ -5915,7 +5915,7 @@ class e_admin_form_ui extends e_form
 								<img src='".e_IMAGE_ABS."generic/loading_16.gif' class='icon action S16' alt='".LAN_LOADING."' />
 							</span>
 						</div>
-						<div class='span4 col-md-4 text-right' style='margin-top:10px;margin-bottom:-10px;padding-top:15px;padding-right:5px'>";
+						<div id='admin-ui-list-db-language' class='span4 col-md-4 text-right' >";
 
 						
 						// Let Admin know which language table is being saved to. (avoid default table overwrites) 
@@ -6097,14 +6097,14 @@ class e_admin_form_ui extends e_form
 		// TODO - core ui-batch-option class!!! REMOVE INLINE STYLE!
 		// XXX Quick Fix for styling - correct. 
 		$text = "
-			<div class='navbar navbar-inner left' style='padding-left:15px; padding-top:8px;'>
+			<div id='admin-ui-list-batch' class='navbar navbar-inner left' >
 				<div class='span6 col-md-6'>";
 				
 		if(!$this->getController()->getTreeModel()->isEmpty())
 		{		
 			$text .= "
 					<div class='input-group input-group-btn input-append'>
-	         		<img src='".e_IMAGE_ABS."generic/branchbottom.gif' alt='' class='icon action' style='padding-top:5px' />
+	         		<img src='".e_IMAGE_ABS."generic/branchbottom.gif' alt='' class='icon action'  />
 						".$this->select_open('etrigger_batch', array('class' => 'tbox form-control select batch e-autosubmit reset', 'id' => false))."
 						".$this->option(LAN_BATCH_LABEL_SELECTED, '', false)."
 						".($allow_copy ? $this->option(LAN_COPY, 'copy', false, array('class' => 'ui-batch-option class', 'other' => 'style="padding-left: 15px"')) : '')."					
@@ -6133,7 +6133,7 @@ class e_admin_form_ui extends e_form
 		
 		$text .= "
 				</div>
-				<div class='span6 col-md-6 right' style='padding-top:5px'><span>".e107::getParser()->lanVars(LAN_UI_TOTAL_RECORDS,number_format($this->listTotal))."</span></div>
+				<div id='admin-ui-list-total-records' class='span6 col-md-6 right'><span>".e107::getParser()->lanVars(LAN_UI_TOTAL_RECORDS,number_format($this->listTotal))."</span></div>
 			</div>
 		";
 	
diff --git a/e107_themes/bootstrap/admin_style.css b/e107_themes/bootstrap/admin_style.css
index 73ac6f326..54f1935f9 100644
--- a/e107_themes/bootstrap/admin_style.css
+++ b/e107_themes/bootstrap/admin_style.css
@@ -3,52 +3,61 @@ body 						{ }
 
 @media (min-width: 1000px){ 
 	
-body						{ padding-top: 75px;  }
+    body						{ padding-top: 75px;  }
 
 } 
 
 
       	
-.well 						{ padding:10px; }
-.navbar 					{  }
+.well 						    { padding:10px; }
+.navbar 					    {  }
 
-#core-infopanel_mye107 a 	{}
+#core-infopanel_mye107 a 	    {}
 
-.tipsy-inner 				{ padding:10px; font-size:15px; } /* deprecated */
-.tooltip 					{ font-size: 13px; }    
-.tooltip-inner 				{  }
+.tipsy-inner 				    { padding:10px; font-size:15px; } /* deprecated */
+.tooltip 					    { font-size: 13px; }
+.tooltip-inner 				    {  }
 
  
 /* Core Formatting */
-.left						{ text-align: left }
-.right						{ text-align: right }
-.center						{ text-align: center }
-.f-left						{ float: left }
-.f-right					{ float: right }
-.top						{ vertical-align: top }
-.middle						{ vertical-align: middle }
-.bottom						{ vertical-align: bottom }
-.clear						{ clear: both }
-.clear-l					{ clear: right }
-.clear-r					{ clear: left }
-.smalltext					{ font-size: 11px; }
-.nowrap						{ white-space:nowrap; }
-.field-spacer 				{ margin-bottom: 3px; } /* multi-fields per row separator */
+.left						    { text-align: left }
+.right						    { text-align: right }
+.center						    { text-align: center }
+.f-left						    { float: left }
+.f-right					    { float: right }
+.top						    { vertical-align: top }
+.middle						    { vertical-align: middle }
+.bottom						    { vertical-align: bottom }
+.clear						    { clear: both }
+.clear-l					    { clear: right }
+.clear-r					    { clear: left }
+.smalltext					    { font-size: 11px; }
+.nowrap						    { white-space:nowrap; }
+.field-spacer 				    { margin-bottom: 3px; } /* multi-fields per row separator */
 
 
-.e-tabs						{ padding:0px }
-.e-tabs fieldset 			{ padding:0px ; padding-left:3px; border-top:0px;}
-#tab-container fieldset 	{ padding:0px ; padding-left:3px; border-top:0px;}
-#tab-container table  		{ border-top:0px;}
-#tab-container td  			{ border-top:0px; border-bottom:1px solid rgb(221, 221, 221) }
-.tab-border 				{ border-left: 1px solid #ddd; }
-.tab-content 				{ overflow: visible }
+.e-tabs						    { padding:0 }
+.e-tabs fieldset 			    { padding:0 ; padding-left:3px; border-top:0;}
+#tab-container fieldset 	    { padding:0 ; padding-left:3px; border-top:0;}
+#tab-container table  		    { border-top:0;}
+#tab-container td  			    { border-top:0; border-bottom:1px solid rgb(221, 221, 221) }
+.tab-border 				    { border-left: 1px solid #ddd; }
+.tab-content 				    { overflow: visible }
 
-.core-mainpanel-block 		{ text-align:center; width:140px; float:left; height:80px; display:block; padding:1px; margin: 0px 2px 15px 2px;  }
-.core-mainpanel-link-text 	{ text-decoration: none; display:block;  }
-a.core-mainpanel-link-icon	{ height:80px; width: 120px; padding-top:20px;  }
+.core-mainpanel-block 		    { text-align:center; width:140px; float:left; height:80px; display:block; padding:1px; margin: 0 2px 15px 2px;  }
+.core-mainpanel-link-text 	    { text-decoration: none; display:block;  }
+a.core-mainpanel-link-icon	    { height:80px; width: 120px; padding-top:20px;  }
 a.core-mainpanel-link-icon:hover { text-decoration: none; filter: none; }
 
+#admin-ui-list-batch            { padding-left:15px; padding-top:8px; }
+#admin-ui-list-batch img        { padding-top:5px }
+#admin-ui-list-filter           { margin-bottom: -10px }
+#admin-ui-list-db-language      { padding-top:12px ; padding-right:10px }
+#admin-ui-list-total-records    { padding-top:5px }
+
+#admin-ui-edit-db-language      { margin-bottom: -30px; margin-top:-10px; padding-bottom:5px; padding-right:5px }
+
+
 div.bbcode-panel {
 	
 	background-color: rgb(245, 245, 245);
diff --git a/e107_themes/bootstrap/admin_theme.php b/e107_themes/bootstrap/admin_theme.php
index 01c30006e..46f3f9f51 100644
--- a/e107_themes/bootstrap/admin_theme.php
+++ b/e107_themes/bootstrap/admin_theme.php
@@ -11,7 +11,10 @@ e107::js('core','bootstrap/js/bootstrap.min.js');
 e107::css('core','bootstrap/css/bootstrap.min.css');
 e107::css('core','bootstrap/css/bootstrap-responsive.min.css');
 //e107::css('core','font-awesome/css/font-awesome.min.css');
-e107::css('url', "//netdna.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css");
+e107::css('url', "http://netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css");
+
+e107::css('core', 	'bootstrap-editable/css/bootstrap-editable.css', 'jquery');
+e107::js('core', 	'bootstrap-editable/js/bootstrap-editable.min.js', 'jquery', 2);
 
 // e107::css('core','bootstrap/css/jquery-ui.custom.css');
 e107::css('theme','admin_style.css');
diff --git a/e107_themes/bootstrap3/admin_theme.php b/e107_themes/bootstrap3/admin_theme.php
index 5aee13177..cc617d8f8 100644
--- a/e107_themes/bootstrap3/admin_theme.php
+++ b/e107_themes/bootstrap3/admin_theme.php
@@ -12,8 +12,8 @@ e107::css('url', 		"http://netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-a
 // be107::css('url', 		"https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/slate/bootstrap.min.css");
 
 
-e107::css('url', 		"http://cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/bootstrap3-editable/css/bootstrap-editable.css");
-e107::js('url', 		"http://cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/bootstrap3-editable/js/bootstrap-editable.min.js");
+e107::css('url', "http://cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/bootstrap3-editable/css/bootstrap-editable.css");
+e107::js('url',  "http://cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/bootstrap3-editable/js/bootstrap-editable.min.js");
 
 
 e107::css('url', 'http://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/slate/bootstrap.min.css');