diff --git a/application/views/giftcards/manage.php b/application/views/giftcards/manage.php
index f48983a17..58f74fffd 100644
--- a/application/views/giftcards/manage.php
+++ b/application/views/giftcards/manage.php
@@ -65,17 +65,15 @@ function post_giftcard_form_submit(response)
 
 <div id="pagination"><?= $links ?></div>
 
-<?php echo form_open("$controller_name/search", array('id'=>'search_form', 'class'=>'form-group')); ?>
-	<div id="table_action_header">
-		<ul>
-			<li class="float_left"><?php echo anchor("$controller_name/delete", '<div class="btn btn-default btn-sm"><span>' . $this->lang->line("common_delete") . '</span></div>', array('id'=>'delete')); ?></li>
-			<li class="float_right">
-				<img src='<?php echo base_url()?>images/spinner_small.gif' alt='spinner' id='spinner' />
-				<input type="text" name ='search' id='search', class='form-control input-sm'/>
-				<input type="hidden" name ='limit_from' id='limit_from'/>
-			</li>
-		</ul>
-	</div>
+<?php echo form_open("$controller_name/search", array('id'=>'search_form', 'class'=>'form-horizontal')); ?>
+	<fieldset>
+		<div id="table_action_header" class="form-group">
+			<ul>
+				<li class="float_left"><?php echo anchor("$controller_name/delete", '<div class="btn btn-default btn-sm"><span>' . $this->lang->line("common_delete") . '</span></div>', array('id'=>'delete')); ?></li>
+				<li class="float_right"><input type="text" name="search" id="search", class="form-control input-sm"/><input type="hidden" name="limit_from" id="limit_from"/></li>
+			</ul>
+		</div>
+	</fieldset>
 <?php echo form_close(); ?>
 
 <div id="table_holder">
diff --git a/application/views/item_kits/manage.php b/application/views/item_kits/manage.php
index 17e368ab4..e11f43ceb 100644
--- a/application/views/item_kits/manage.php
+++ b/application/views/item_kits/manage.php
@@ -78,18 +78,16 @@ function post_item_kit_form_submit(response)
 
 <div id="pagination"><?= $links ?></div>
 
-<?php echo form_open("$controller_name/search", array('id'=>'search_form', 'class'=>'form-group')); ?>
-	<div id="table_action_header">
-		<ul>
-			<li class="float_left"><?php echo anchor("$controller_name/delete", '<div class="btn btn-default btn-sm"><span>' . $this->lang->line("common_delete") . '</span></div>', array('id'=>'delete')); ?></li>
-			<li class="float_left"><?php echo anchor("$controller_name/generate_barcodes", '<div class="btn btn-default btn-sm"><span>' . $this->lang->line("items_generate_barcodes") . '</span></div>', array('id'=>'generate_barcodes', 'target' =>'_blank', 'title'=>$this->lang->line('items_generate_barcodes'))); ?></li>
-			<li class="float_right">
-				<img src='<?php echo base_url()?>images/spinner_small.gif' alt='spinner' id='spinner' />
-				<input type="text" name ='search' id='search', class='form-control input-sm' />
-				<input type="hidden" name ='limit_from' id='limit_from' />
-			</li>
-		</ul>
-	</div>
+<?php echo form_open("$controller_name/search", array('id'=>'search_form', 'class'=>'form-horizontal')); ?>
+	<fieldset>
+		<div id="table_action_header" class="form-group">
+			<ul>
+				<li class="float_left"><?php echo anchor("$controller_name/delete", '<div class="btn btn-default btn-sm"><span>' . $this->lang->line("common_delete") . '</span></div>', array('id'=>'delete')); ?></li>
+				<li class="float_left"><?php echo anchor("$controller_name/generate_barcodes", '<div class="btn btn-default btn-sm"><span>' . $this->lang->line("items_generate_barcodes") . '</span></div>', array('id'=>'generate_barcodes', 'target' =>'_blank', 'title'=>$this->lang->line('items_generate_barcodes'))); ?></li>
+				<li class="float_right"><input type="text" name="search" id="search", class="form-control input-sm"/><input type="hidden" name="limit_from" id="limit_from"/></li>
+			</ul>
+		</div>
+	</fieldset>
 <?php echo form_close(); ?>
 
 <div id="table_holder">
diff --git a/application/views/items/manage.php b/application/views/items/manage.php
index cd0c84f5e..025abde90 100644
--- a/application/views/items/manage.php
+++ b/application/views/items/manage.php
@@ -175,46 +175,45 @@ function post_bulk_form_submit(response)
 	<img src="<?php echo base_url().'images/plus.png'; ?>" style="border:0;outline:none;padding:0px;margin:0px;position:relative;top:-5px;"></a>
 </div>
 
-<?php echo form_open("$controller_name/search", array('id'=>'search_form', 'class'=>'form-group')); ?>
-	<div id="search_filter_section" style="display:none;">
-		<?php echo form_label($this->lang->line('items_empty_upc_items').' '.':', 'empty_upc');?>
-		<?php echo form_checkbox(array('name'=>'empty_upc','id'=>'empty_upc','value'=>1,'checked'=> isset($empty_upc)?  ( ($empty_upc)? 1 : 0) : 0)).' | ';?>
-		<?php echo form_label($this->lang->line('items_low_inventory_items').' '.':', 'low_inventory');?>
-		<?php echo form_checkbox(array('name'=>'low_inventory','id'=>'low_inventory','value'=>1,'checked'=> isset($low_inventory)?  ( ($low_inventory)? 1 : 0) : 0)).' | ';?>
-		<?php echo form_label($this->lang->line('items_serialized_items').' '.':', 'is_serialized');?>
-		<?php echo form_checkbox(array('name'=>'is_serialized','id'=>'is_serialized','value'=>1,'checked'=> isset($is_serialized)?  ( ($is_serialized)? 1 : 0) : 0)).' | ';?>
-		<?php echo form_label($this->lang->line('items_no_description_items').' '.':', 'no_description');?>
-		<?php echo form_checkbox(array('name'=>'no_description','id'=>'no_description','value'=>1,'checked'=> isset($no_description)?  ( ($no_description)? 1 : 0) : 0)).' | ';?>
-		<?php echo form_label($this->lang->line('items_search_custom_items').' '.':', 'search_custom');?>
-		<?php echo form_checkbox(array('name'=>'search_custom','id'=>'search_custom','value'=>1,'checked'=> isset($search_custom)?  ( ($search_custom)? 1 : 0) : 0)).' | ';?>
-		<?php echo form_label($this->lang->line('items_is_deleted').' '.':', 'is_deleted');?> 
-		<?php echo form_checkbox(array('name'=>'is_deleted','id'=>'is_deleted','value'=>1,'checked'=> isset($is_deleted)?  ( ($is_deleted)? 1 : 0) : 0));?> 
+<?php echo form_open("$controller_name/search", array('id'=>'search_form', 'class'=>'form-horizontal')); ?>
+	<fieldset>
+		<div id="search_filter_section" class="form-group" style="display:none;">
+			<?php echo form_label($this->lang->line('items_empty_upc_items').' '.':', 'empty_upc');?>
+			<?php echo form_checkbox(array('name'=>'empty_upc','id'=>'empty_upc','value'=>1,'checked'=> isset($empty_upc)?  ( ($empty_upc)? 1 : 0) : 0)).' | ';?>
+			<?php echo form_label($this->lang->line('items_low_inventory_items').' '.':', 'low_inventory');?>
+			<?php echo form_checkbox(array('name'=>'low_inventory','id'=>'low_inventory','value'=>1,'checked'=> isset($low_inventory)?  ( ($low_inventory)? 1 : 0) : 0)).' | ';?>
+			<?php echo form_label($this->lang->line('items_serialized_items').' '.':', 'is_serialized');?>
+			<?php echo form_checkbox(array('name'=>'is_serialized','id'=>'is_serialized','value'=>1,'checked'=> isset($is_serialized)?  ( ($is_serialized)? 1 : 0) : 0)).' | ';?>
+			<?php echo form_label($this->lang->line('items_no_description_items').' '.':', 'no_description');?>
+			<?php echo form_checkbox(array('name'=>'no_description','id'=>'no_description','value'=>1,'checked'=> isset($no_description)?  ( ($no_description)? 1 : 0) : 0)).' | ';?>
+			<?php echo form_label($this->lang->line('items_search_custom_items').' '.':', 'search_custom');?>
+			<?php echo form_checkbox(array('name'=>'search_custom','id'=>'search_custom','value'=>1,'checked'=> isset($search_custom)?  ( ($search_custom)? 1 : 0) : 0)).' | ';?>
+			<?php echo form_label($this->lang->line('items_is_deleted').' '.':', 'is_deleted');?> 
+			<?php echo form_checkbox(array('name'=>'is_deleted','id'=>'is_deleted','value'=>1,'checked'=> isset($is_deleted)?  ( ($is_deleted)? 1 : 0) : 0));?> 
 
-		<?php echo form_label($this->lang->line('sales_date_range').' :', 'start_date');?>
-		<?php echo form_input(array('name'=>'start_date','value'=>$start_date, 'class'=>'date_filter', 'size' => '15'));?>
-		<?php echo form_label(' - ', 'end_date');?>
-		<?php echo form_input(array('name'=>'end_date','value'=>$end_date, 'class'=>'date_filter', 'size' => '15'));?>
-	</div>
+			<?php echo form_label($this->lang->line('sales_date_range').' :', 'start_date');?>
+			<?php echo form_input(array('name'=>'start_date','value'=>$start_date, 'class'=>'date_filter', 'size'=>'15'));?>
+			<?php echo form_label(' - ', 'end_date');?>
+			<?php echo form_input(array('name'=>'end_date','value'=>$end_date, 'class'=>'date_filter', 'size'=>'15'));?>
+		</div>
 
-	<div id="table_action_header">
-		<ul>
-			<li class="float_left"><?php echo anchor("$controller_name/delete", '<div class="btn btn-default btn-sm"><span>' . $this->lang->line("common_delete") . '</span></div>', array('id'=>'delete')); ?></li>
-			<li class="float_left"><?php echo anchor("$controller_name/bulk_edit", '<div class="btn btn-default btn-sm"><span>' . $this->lang->line("items_bulk_edit") . '</span></div>', array('id'=>'bulk_edit', 'modal-dlg modal-btn-submit', 'title'=>$this->lang->line('items_edit_multiple_items'))); ?></li>
-			<li class="float_left"><?php echo anchor("$controller_name/generate_barcodes", '<div class="btn btn-default btn-sm"><span>' . $this->lang->line("items_generate_barcodes") . '</span></div>', array('id'=>'generate_barcodes', 'target' =>'_blank', 'title'=>$this->lang->line('items_generate_barcodes'))); ?></li>
-			<?php
-			if (count($stock_locations) > 1)
-			{
-			?>
-				<li class="float_left"><span><?php echo form_dropdown('stock_location', $stock_locations, $stock_location, array('id'=>'stock_location', 'onchange'=>"$('#search_form').submit();", 'class'=>'selectpicker show-menu-arrow', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?></span></li>
-			<?php
-			}
-			?>
-			<li class="float_right">
-				<input type="text" name ='search' id='search', class='form-control input-sm'/>
-				<input type="hidden" name ='limit_from' id='limit_from'/>
-			</li>
-		</ul>
-	</div>
+		<div id="table_action_header" class="form-group">
+			<ul>
+				<li class="float_left"><?php echo anchor("$controller_name/delete", '<div class="btn btn-default btn-sm"><span>' . $this->lang->line("common_delete") . '</span></div>', array('id'=>'delete')); ?></li>
+				<li class="float_left"><?php echo anchor("$controller_name/bulk_edit", '<div class="btn btn-default btn-sm"><span>' . $this->lang->line("items_bulk_edit") . '</span></div>', array('id'=>'bulk_edit', 'class'=>'modal-dlg modal-btn-submit', 'title'=>$this->lang->line('items_edit_multiple_items'))); ?></li>
+				<li class="float_left"><?php echo anchor("$controller_name/generate_barcodes", '<div class="btn btn-default btn-sm"><span>' . $this->lang->line("items_generate_barcodes") . '</span></div>', array('id'=>'generate_barcodes', 'target' =>'_blank', 'title'=>$this->lang->line('items_generate_barcodes'))); ?></li>
+				<?php
+				if (count($stock_locations) > 1)
+				{
+				?>
+					<li class="float_left"><span><?php echo form_dropdown('stock_location', $stock_locations, $stock_location, array('id'=>'stock_location', 'onchange'=>"$('#search_form').submit();", 'class'=>'selectpicker show-menu-arrow', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?></span></li>
+				<?php
+				}
+				?>
+				<li class="float_right"><input type="text" name="search" id="search", class="form-control input-sm"/><input type="hidden" name="limit_from" id="limit_from"/></li>
+			</ul>
+		</div>
+	</fieldset>
 <?php echo form_close(); ?>
 
 <div id="table_holder">
diff --git a/application/views/partial/header.php b/application/views/partial/header.php
index e4934a5e5..c340a5de7 100644
--- a/application/views/partial/header.php
+++ b/application/views/partial/header.php
@@ -65,11 +65,11 @@
 		<!-- start mincss template tags -->
 		<link rel="stylesheet" type="text/css" href="dist/bootstrap.min.css?rel=9ed20b1ee8"/>
 		<link rel="stylesheet" type="text/css" href="dist/jquery-ui.css"/>
-		<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=400d6cd480"/>
+		<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=d28985b4ea"/>
 		<link rel="stylesheet" type="text/css" href="dist/opensourcepos_bower.css"/>
 		<!-- end mincss template tags -->
 		<!-- start minjs template tags -->
-		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=87aa85a1f1" language="javascript"></script>
+		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=ab845a1430" language="javascript"></script>
 		<!-- end minjs template tags -->
 	<?php endif; ?>
 
diff --git a/application/views/people/manage.php b/application/views/people/manage.php
index fe2058b52..67a3a0fc6 100644
--- a/application/views/people/manage.php
+++ b/application/views/people/manage.php
@@ -86,18 +86,16 @@ function post_person_form_submit(response)
 
 <div id="pagination"><?= $links ?></div>
 
-<?php echo form_open("$controller_name/search", array('id'=>'search_form', 'class'=>'form-group')); ?>
-	<div id="table_action_header">
-		<ul>
-			<li class="float_left"><?php echo anchor("$controller_name/delete", '<div class="btn btn-default btn-sm"><span>' . $this->lang->line("common_delete") . '</span></div>', array('id'=>'delete')); ?></li>
-			<li class="float_left"><span><a href="#" id="email"><div class="btn btn-default btn-sm"><?php echo $this->lang->line("common_email");?></div></a></span></li>
-			<li class="float_right">
-				<img src='<?php echo base_url()?>images/spinner_small.gif' alt='spinner' id='spinner' />
-				<input type="text" name ='search' id='search', class='form-control input-sm' />
-				<input type="hidden" name ='limit_from' id='limit_from' />
-			</li>
-		</ul>
-	</div>
+<?php echo form_open("$controller_name/search", array('id'=>'search_form', 'class'=>'form-horizontal')); ?>
+	<fieldset>
+		<div id="table_action_header" class="form-group">
+			<ul>
+				<li class="float_left"><?php echo anchor("$controller_name/delete", '<div class="btn btn-default btn-sm"><span>' . $this->lang->line("common_delete") . '</span></div>', array('id'=>'delete')); ?></li>
+				<li class="float_left"><span><a href="#" id="email"><div class="btn btn-default btn-sm"><?php echo $this->lang->line("common_email");?></div></a></span></li>
+				<li class="float_right"><input type="text" name="search" id="search", class="form-control input-sm"/><input type="hidden" name="limit_from" id="limit_from"/></li>
+			</ul>
+		</div>
+	</fieldset>
 <?php echo form_close(); ?>
 
 <div id="table_holder">
diff --git a/application/views/sales/manage.php b/application/views/sales/manage.php
index fbbd0fb27..c910c68fc 100755
--- a/application/views/sales/manage.php
+++ b/application/views/sales/manage.php
@@ -208,30 +208,28 @@ function init_table_sorting()
 	<img src="<?php echo base_url().'images/plus.png'; ?>" style="border:0;outline:none;padding:0px;margin:0px;position:relative;top:-5px;"></a>
 </div>
 
-<?php echo form_open("$controller_name/search", array('id'=>'search_form', 'class'=>'form-group')); ?>
-	<div id="search_filter_section" style="display:none;">
-		<?php echo form_label($this->lang->line('sales_invoice_filter').' '.':', 'invoices_filter');?>
-		<?php echo form_checkbox(array('name'=>'only_invoices','id'=>'only_invoices','value'=>1,'checked'=> isset($only_invoices)?  ( ($only_invoices)? 1 : 0) : 0)) . ' | ';?>
-		<?php echo form_label($this->lang->line('sales_cash_filter').' '.':', 'cash_filter');?>
-		<?php echo form_checkbox(array('name'=>'only_cash','id'=>'only_cash','value'=>1,'checked'=> isset($only_cash)?  ( ($only_cash)? 1 : 0) : 0)) . ' | ';?>
+<?php echo form_open("$controller_name/search", array('id'=>'search_form', 'class'=>'form-horizontal')); ?>
+	<fieldset>
+		<div id="search_filter_section" class="form-group" style="display:none;">
+			<?php echo form_label($this->lang->line('sales_invoice_filter').' '.':', 'invoices_filter');?>
+			<?php echo form_checkbox(array('name'=>'only_invoices','id'=>'only_invoices','value'=>1,'checked'=> isset($only_invoices)?  ( ($only_invoices)? 1 : 0) : 0)) . ' | ';?>
+			<?php echo form_label($this->lang->line('sales_cash_filter').' '.':', 'cash_filter');?>
+			<?php echo form_checkbox(array('name'=>'only_cash','id'=>'only_cash','value'=>1,'checked'=> isset($only_cash)?  ( ($only_cash)? 1 : 0) : 0)) . ' | ';?>
 
-		<?php echo form_label($this->lang->line('sales_date_range').' :', 'start_date');?>
-		<?php echo form_input(array('name'=>'start_date', 'value'=>$start_date, 'class'=>'date_filter', 'size' => '22'));?>
-		<?php echo form_label(' - ', 'end_date');?>
-		<?php echo form_input(array('name'=>'end_date', 'value'=>$end_date, 'class'=>'date_filter', 'size' => '22'));?>
-	</div>
+			<?php echo form_label($this->lang->line('sales_date_range').' :', 'start_date');?>
+			<?php echo form_input(array('name'=>'start_date', 'value'=>$start_date, 'class'=>'date_filter', 'size' => '22'));?>
+			<?php echo form_label(' - ', 'end_date');?>
+			<?php echo form_input(array('name'=>'end_date', 'value'=>$end_date, 'class'=>'date_filter', 'size' => '22'));?>
+		</div>
 
-	<div id="table_action_header">
-		<ul>
-			<li class="float_left"><?php echo anchor($controller_name . "/delete", '<div class="btn btn-default btn-sm"><span>' . $this->lang->line("common_delete") . '</span></div>', array('id'=>'delete')); ?></li>
-			<!-- li class="float_left"><?php echo anchor($controller_name . "/update_invoice_numbers", '<div class="btn btn-default btn-sm"><span>' . $this->lang->line('sales_invoice_update') . '</span></div>', array('id'=>'update_invoice_numbers')); ?></li -->
-			<li class="float_right">
-				<img src='<?php echo base_url(); ?>images/spinner_small.gif' alt='spinner' id='spinner' />
-				<input type="text" name ='search' id='search', class='form-control input-sm'/>
-				<input type="hidden" name ='limit_from' id='limit_from'/>
-			</li>
-		</ul>
-	</div>
+		<div id="table_action_header" class="form-group">
+			<ul>
+				<li class="float_left"><?php echo anchor($controller_name . "/delete", '<div class="btn btn-default btn-sm"><span>' . $this->lang->line("common_delete") . '</span></div>', array('id'=>'delete')); ?></li>
+				<!-- li class="float_left"><?php echo anchor($controller_name . "/update_invoice_numbers", '<div class="btn btn-default btn-sm"><span>' . $this->lang->line('sales_invoice_update') . '</span></div>', array('id'=>'update_invoice_numbers')); ?></li -->
+				<li class="float_right"><input type="text" name="search" id="search", class="form-control input-sm"/><input type="hidden" name="limit_from" id="limit_from"/></li>
+			</ul>
+		</div>
+	</fieldset>
 <?php echo form_close(); ?>
 
 <div id="table_holder" class="totals">
diff --git a/application/views/suppliers/manage.php b/application/views/suppliers/manage.php
index 6ef10520c..a8251df96 100644
--- a/application/views/suppliers/manage.php
+++ b/application/views/suppliers/manage.php
@@ -66,18 +66,16 @@ function post_person_form_submit(response)
 
 <div id="pagination"><?= $links ?></div>
 
-<?php echo form_open("$controller_name/search", array('id'=>'search_form', 'class'=>'form-group')); ?>
-	<div id="table_action_header">
-		<ul>
-			<li class="float_left"><?php echo anchor("$controller_name/delete", '<div class="btn btn-default btn-sm"><span>' . $this->lang->line("common_delete") . '</span></div>', array('id'=>'delete')); ?></li>
-			<li class="float_left"><span><a href="#" id="email"><div class="btn btn-default btn-sm"><?php echo $this->lang->line("common_email");?></div></a></span></li>
-			<li class="float_right">
-				<img src='<?php echo base_url()?>images/spinner_small.gif' alt='spinner' id='spinner' />
-				<input type="text" name ='search' id='search', class='form-control input-sm' />
-				<input type="hidden" name ='limit_from' id='limit_from' />
-			</li>
-		</ul>
-	</div>
+<?php echo form_open("$controller_name/search", array('id'=>'search_form', 'class'=>'form-horizontal')); ?>
+	<fieldset>
+		<div id="table_action_header" class="form-group">
+			<ul>
+				<li class="float_left"><?php echo anchor("$controller_name/delete", '<div class="btn btn-default btn-sm"><span>' . $this->lang->line("common_delete") . '</span></div>', array('id'=>'delete')); ?></li>
+				<li class="float_left"><span><a href="#" id="email"><div class="btn btn-default btn-sm"><?php echo $this->lang->line("common_email");?></div></a></span></li>
+				<li class="float_right"><input type="text" name="search" id="search", class="form-control input-sm"/><input type="hidden" name="limit_from" id="limit_from"/></li>
+			</ul>
+		</div>
+	</fieldset>
 <?php echo form_close(); ?>
 
 <div id="table_holder">