diff --git a/e107_admin/admin.php b/e107_admin/admin.php
index a88fe6c08..1002dfc5f 100644
--- a/e107_admin/admin.php
+++ b/e107_admin/admin.php
@@ -167,6 +167,7 @@ class admin_start
 	{
 		$mes = e107::getMessage();
 		$public = array(e_UPLOAD, e_AVATAR_UPLOAD);
+		$tp = e107::getParser();
 		$exceptions = array(".","..","/","CVS","avatars","Thumbs.db",".ftpquota",".htaccess","php.ini",".cvsignore",'e107.htaccess');
 		
 		//TODO use $file-class to grab list and perform this check. 
@@ -205,7 +206,7 @@ class admin_start
 		if (isset($potential))
 		{
 			//$text = ADLAN_ERR_3."<br /><br />";
-			$mes->addWarning(ADLAN_ERR_3);
+			$mes->addWarning($tp->toHtml(ADLAN_ERR_3, true));
 			$text = '<ul>';
 			foreach ($potential as $p_file)
 			{
diff --git a/e107_core/templates/nextprev_template.php b/e107_core/templates/nextprev_template.php
index 41509ef75..ba0380d57 100644
--- a/e107_core/templates/nextprev_template.php
+++ b/e107_core/templates/nextprev_template.php
@@ -112,25 +112,25 @@ $NEXTPREV_TEMPLATE['basic_separator'] 			= '';
 
 $NEXTPREV_TEMPLATE['admin_start'] = '
 <!-- Start of Next/Prev -->
-<div class="btn-group nextprev ">
-';
+<div class="pagination nextprev ">
+<ul class="pagination">';
 
 $NEXTPREV_TEMPLATE['admin_end'] = '
-</div>
+</ul></div>
 <!-- End of Next/Prev -->
 ';
 
 //$NEXTPREV_TEMPLATE['admin_nav_caption'] = '<span class="nexprev-caption center">{caption}</span>&nbsp;'; XXX - awaiting the new front-end themes & templates
 $NEXTPREV_TEMPLATE['admin_nav_caption'] = ''; // NP_3.'&nbsp;';
 
-$NEXTPREV_TEMPLATE['admin_nav_first'] = '<a class="btn btn-default nextprev-item first e-tip" href="{url}" title="{url_label}"><i class="fa fa-fast-backward"></i></a>';
-$NEXTPREV_TEMPLATE['admin_nav_prev'] = '<a class="btn btn-default nextprev-item prev e-tip" href="{url}" title="{url_label}"><i class="fa fa-backward"></i></a>';
-$NEXTPREV_TEMPLATE['admin_nav_last'] = '<a class="btn btn-default nextprev-item last e-tip" href="{url}" title="{url_label}"><i class="fa fa-fast-forward"></i></a>';
-$NEXTPREV_TEMPLATE['admin_nav_next'] = '<a class="btn btn-default nextprev-item next e-tip" href="{url}" title="{url_label}"><i class="fa fa-forward icon-forward"></i></a>';
+$NEXTPREV_TEMPLATE['admin_nav_first'] = '<li><a class="nextprev-item first e-tip" href="{url}" title="{url_label}"><i class="fa fa-fast-backward"></i></a></li>';
+$NEXTPREV_TEMPLATE['admin_nav_prev'] = '<li><a class="nextprev-item prev e-tip" href="{url}" title="{url_label}"><i class="fa fa-backward"></i></a></li>';
+$NEXTPREV_TEMPLATE['admin_nav_last'] = '<li><a class="nextprev-item last e-tip" href="{url}" title="{url_label}"><i class="fa fa-fast-forward"></i></a></li>';
+$NEXTPREV_TEMPLATE['admin_nav_next'] = '<li><a class="nextprev-item next e-tip" href="{url}" title="{url_label}"><i class="fa fa-forward icon-forward"></i></a></li>';
 
 $NEXTPREV_TEMPLATE['admin_items_start'] = '';
-$NEXTPREV_TEMPLATE['admin_item'] = '<a class="btn btn-default nextprev-item e-tip" href="{url}" title="{url_label}">{label}</a>';
-$NEXTPREV_TEMPLATE['admin_item_current'] = '<a class="btn btn-default nextprev-item current active" href="#" onclick="return false;" title="{url_label}">{label}</a>';
+$NEXTPREV_TEMPLATE['admin_item'] = '<li><a class="nextprev-item e-tip" href="{url}" title="{url_label}">{label}</a></li>';
+$NEXTPREV_TEMPLATE['admin_item_current'] = '<li><a class="nextprev-item current active" href="#" onclick="return false;" title="{url_label}">{label}</a></li>';
 $NEXTPREV_TEMPLATE['admin_items_end'] = '';
 
 //$NEXTPREV_TEMPLATE['admin_separator'] = '<span class="nextprev-sep"><!-- --></span>';
diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php
index 32d9d04b2..d437c8d6c 100644
--- a/e107_handlers/admin_ui.php
+++ b/e107_handlers/admin_ui.php
@@ -6103,9 +6103,9 @@ class e_admin_form_ui extends e_form
 		if(!$this->getController()->getTreeModel()->isEmpty())
 		{		
 			$text .= "
-					<div class='form-inline'>
+					<div class='form-inline input-inline'>
 	         		<img src='".e_IMAGE_ABS."generic/branchbottom.gif' alt='' class='icon action'  />
-	         		<div class='input-group'>
+	         		<div class='input-group input-append'>
 						".$this->select_open('etrigger_batch', array('class' => 'tbox form-control input-large 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"')) : '')."					
@@ -6126,7 +6126,7 @@ class e_admin_form_ui extends e_form
 			$text .= "
 				".$this->renderBatchFilter('batch')."
 				".$this->select_close()."
-				<div class='input-group-btn'>
+				<div class='input-group-btn input-append'>
 				".$this->admin_button('e__execute_batch', 'e__execute_batch', 'batch e-hide-if-js', LAN_GO, array('id' => false))."
 				</div></div></div>
 			";
diff --git a/e107_themes/bootstrap3/admin_style.css b/e107_themes/bootstrap3/admin_style.css
index 66e9ce5ac..390199377 100644
--- a/e107_themes/bootstrap3/admin_style.css
+++ b/e107_themes/bootstrap3/admin_style.css
@@ -48,7 +48,7 @@ body						{ padding-top: 75px;  }
 .core-mainpanel-block 		{ text-align:center; width:20%; float:left; height:80px; display:block; padding:1px 5px; margin: 0px 0px 10px 0px;  }
 .core-mainpanel-link-text 	{ text-decoration: none; display:block;  }
 /* a.core-mainpanel-link-icon	{ height:100px; width: 141px; padding-top:20px;  } */
-a.core-mainpanel-link-icon	{ height:80px; width: 100%; padding-top:20px;  }
+a.core-mainpanel-link-icon	{ height:80px; width: 100%; padding-top:15px;  }
 a.core-mainpanel-link-icon:hover { text-decoration: none; filter: none; }
 
 .carousel-indicators        { top:10px; max-width: 200px; 	height: 40px; 	margin-left: 100px;  }