diff --git a/application/controllers/Items.php b/application/controllers/Items.php
index 4f479c813..b29cfbfb8 100644
--- a/application/controllers/Items.php
+++ b/application/controllers/Items.php
@@ -476,7 +476,7 @@ class Items extends Secure_area implements iData_controller
             {
             	$success_message = $this->lang->line('items_successful_' . ($new_item ? 'adding' : 'updating')) .' '. $item_data['name'];
 
-            	echo json_encode(array('success'=>true,'message'=>$success_message,'item_id'=>$item_id));
+            	echo json_encode(array('success'=>true, 'message'=>$success_message, 'item_id'=>$item_id));
             }
             else
             {
@@ -484,16 +484,13 @@ class Items extends Secure_area implements iData_controller
 	            	$this->lang->line('items_error_adding_updating') .' '. $item_data['name'] : 
     	        	$this->upload->display_errors(); 
 
-            	echo json_encode(array('success'=>false,
-            			'message'=>$error_message,'item_id'=>$item_id)); 
+            	echo json_encode(array('success'=>false, 'message'=>$error_message, 'item_id'=>$item_id)); 
             }
             
 		}
 		else//failure
 		{
-			echo json_encode(array('success'=>false,
-					'message'=>$this->lang->line('items_error_adding_updating').' '
-					.$item_data['name'],'item_id'=>-1));
+			echo json_encode(array('success'=>false, 'message'=>$this->lang->line('items_error_adding_updating').' '.$item_data['name'], 'item_id'=>-1));
 		}
 	}
 	
diff --git a/application/helpers/table_helper.php b/application/helpers/table_helper.php
index 92e160873..23111f77f 100644
--- a/application/helpers/table_helper.php
+++ b/application/helpers/table_helper.php
@@ -50,7 +50,7 @@ function get_sales_manage_table_data_rows($sales, $controller)
 
 	if($table_data_rows == '')
 	{
-		$table_data_rows .= "<tr><td colspan='10'><div class='warning_message' style='padding:7px;'>".$CI->lang->line('sales_no_sales_to_display')."</div></td></tr>";
+		$table_data_rows .= "<tr><td colspan='10'><div class='alert alert-dismissible alert-warning'>".$CI->lang->line('sales_no_sales_to_display')."</div></td></tr>";
 	}
 	else
 	{
@@ -157,7 +157,7 @@ function get_people_manage_table_data_rows($people,$controller)
 	
 	if($people->num_rows()==0)
 	{
-		$table_data_rows.="<tr><td colspan='6'><div class='warning_message' style='padding:7px;'>".$CI->lang->line('common_no_persons_to_display')."</div></td></tr>";
+		$table_data_rows.="<tr><td colspan='6'><div class='alert alert-dismissible alert-warning'>".$CI->lang->line('common_no_persons_to_display')."</div></td></tr>";
 	}
 	
 	return $table_data_rows;
@@ -241,7 +241,7 @@ function get_supplier_manage_table_data_rows($suppliers,$controller)
 	
 	if($suppliers->num_rows()==0)
 	{
-		$table_data_rows.="<tr><td colspan='9'><div class='warning_message' style='padding:7px;'>".$CI->lang->line('common_no_persons_to_display')."</div></td></tr>";
+		$table_data_rows.="<tr><td colspan='9'><div class='alert alert-dismissible alert-warning'>".$CI->lang->line('common_no_persons_to_display')."</div></td></tr>";
 	}
 	
 	return $table_data_rows;
@@ -317,7 +317,7 @@ function get_items_manage_table_data_rows($items,$controller)
 	
 	if($items->num_rows()==0)
 	{
-		$table_data_rows.="<tr><td colspan='12'><div class='warning_message' style='padding:7px;'>".$CI->lang->line('items_no_items_to_display')."</div></td></tr>";
+		$table_data_rows.="<tr><td colspan='12'><div class='alert alert-dismissible alert-warning'>".$CI->lang->line('items_no_items_to_display')."</div></td></tr>";
 	}
 	
 	return $table_data_rows;
@@ -411,7 +411,7 @@ function get_giftcards_manage_table_data_rows( $giftcards, $controller )
 	
 	if($giftcards->num_rows()==0)
 	{
-		$table_data_rows.="<tr><td colspan='11'><div class='warning_message' style='padding:7px;'>".$CI->lang->line('giftcards_no_giftcards_to_display')."</div></td></tr>";
+		$table_data_rows.="<tr><td colspan='11'><div class='alert alert-dismissible alert-warning'>".$CI->lang->line('giftcards_no_giftcards_to_display')."</div></td></tr>";
 	}
 	
 	return $table_data_rows;
@@ -479,7 +479,7 @@ function get_item_kits_manage_table_data_rows($item_kits, $controller)
 	
 	if($item_kits->num_rows()==0)
 	{
-		$table_data_rows .= "<tr><td colspan='11'><div class='warning_message' style='padding:7px;'>".$CI->lang->line('item_kits_no_item_kits_to_display')."</div></td></tr>";
+		$table_data_rows .= "<tr><td colspan='11'><div class='alert alert-dismissible alert-warning'>".$CI->lang->line('item_kits_no_item_kits_to_display')."</div></td></tr>";
 	}
 	
 	return $table_data_rows;
diff --git a/application/views/configs/barcode_config.php b/application/views/configs/barcode_config.php
index 4f6273186..cd803993f 100644
--- a/application/views/configs/barcode_config.php
+++ b/application/views/configs/barcode_config.php
@@ -1,7 +1,6 @@
 <div id="page_title"><?php echo $this->lang->line('config_barcode_configuration'); ?></div>
-<?php
-echo form_open('config/save_barcode/',array('id'=>'barcode_config_form'));
-?>
+
+<?php echo form_open('config/save_barcode/',array('id'=>'barcode_config_form')); ?>
     <div id="config_wrapper">
         <fieldset id="config_info">
             <div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
@@ -177,9 +176,7 @@ echo form_open('config/save_barcode/',array('id'=>'barcode_config_form'));
             ?>
         </fieldset>
     </div>
-<?php
-echo form_close();
-?>
+<?php echo form_close(); ?>
 
 
 <script type='text/javascript'>
@@ -195,11 +192,11 @@ $(document).ready(function()
             {
                 if(response.success)
                 {
-                    set_feedback(response.message,'success_message',false);     
+                    set_feedback(response.message, 'alert alert-dismissible alert-success', false);     
                 }
                 else
                 {
-                    set_feedback(response.message,'error_message',true);        
+                    set_feedback(response.message, 'alert alert-dismissible alert-danger', true);        
                 }
             },
             dataType:'json'
diff --git a/application/views/configs/general_config.php b/application/views/configs/general_config.php
index 0575d9bcf..052c910ae 100644
--- a/application/views/configs/general_config.php
+++ b/application/views/configs/general_config.php
@@ -1,317 +1,314 @@
 <div id="page_title"><?php echo $this->lang->line('config_general_configuration'); ?></div>
-<?php
-echo form_open('config/save/',array('id'=>'config_form','enctype'=>'multipart/form-data'));
-?>
-<div id="config_wrapper">
-<fieldset id="config_info">
-<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
-<ul id="error_message_box" class="error_message_box"></ul>
-<legend><?php echo $this->lang->line("config_info"); ?></legend>
 
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_company').':', 'company',array('class'=>'wide required')); ?>
-	<div class='form_field'>
-		<?php echo form_input(array(
-			'name'=>'company',
-			'id'=>'company',
-			'value'=>$this->config->item('company')));?>
-		
+<?php echo form_open('config/save/',array('id'=>'config_form','enctype'=>'multipart/form-data')); ?>
+	<div id="config_wrapper">
+		<fieldset id="config_info">
+			<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+			<ul id="error_message_box" class="error_message_box"></ul>
+			<legend><?php echo $this->lang->line("config_info"); ?></legend>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_company').':', 'company',array('class'=>'wide required')); ?>
+				<div class='form_field'>
+					<?php echo form_input(array(
+						'name'=>'company',
+						'id'=>'company',
+						'value'=>$this->config->item('company')));?>
+					
+				</div>
+			</div>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_company_logo').':', 'company_logo',array('class'=>'wide')); ?>
+				<div class='form_field'>
+					<?php echo form_upload('company_logo');?>
+				</div>
+			</div>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_address').':', 'address',array('class'=>'wide required')); ?>
+				<div class='form_field'>
+				<?php echo form_textarea(array(
+					'name'=>'address',
+					'id'=>'address',
+					'rows'=>4,
+					'cols'=>17,
+					'value'=>$this->config->item('address')));?>
+				</div>
+			</div>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_website').':', 'website',array('class'=>'wide')); ?>
+				<div class='form_field'>
+				<?php echo form_input(array(
+					'name'=>'website',
+					'id'=>'website',
+					'value'=>$this->config->item('website')));?>
+				</div>
+			</div>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('common_email').':', 'email',array('class'=>'wide')); ?>
+				<div class='form_field'>
+				<?php echo form_input(array(
+					'name'=>'email',
+					'id'=>'email',
+					'value'=>$this->config->item('email')));?>
+				</div>
+			</div>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_phone').':', 'phone',array('class'=>'wide required')); ?>
+				<div class='form_field'>
+				<?php echo form_input(array(
+					'name'=>'phone',
+					'id'=>'phone',
+					'value'=>$this->config->item('phone')));?>
+				</div>
+			</div>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_fax').':', 'fax',array('class'=>'wide')); ?>
+				<div class='form_field'>
+				<?php echo form_input(array(
+					'name'=>'fax',
+					'id'=>'fax',
+					'value'=>$this->config->item('fax')));?>
+				</div>
+			</div>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('common_return_policy').':', 'return_policy',array('class'=>'wide required')); ?>
+				<div class='form_field'>
+				<?php echo form_textarea(array(
+					'name'=>'return_policy',
+					'id'=>'return_policy',
+					'rows'=>'4',
+					'cols'=>'17',
+					'value'=>$this->config->item('return_policy')));?>
+				</div>
+			</div>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_default_tax_rate_1').':', 'default_tax_1_rate',array('class'=>'wide required')); ?>
+				<div class='form_field'>
+				<?php echo form_input(array(
+					'name'=>'default_tax_1_name',
+					'id'=>'default_tax_1_name',
+					'size'=>'10',
+					'value'=>$this->config->item('default_tax_1_name')!==FALSE ? $this->config->item('default_tax_1_name') : $this->lang->line('items_sales_tax_1')));?>
+					
+				<?php echo form_input(array(
+					'name'=>'default_tax_1_rate',
+					'id'=>'default_tax_1_rate',
+					'size'=>'4',
+					'value'=>$this->config->item('default_tax_1_rate')));?>%
+				</div>
+			</div>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_default_tax_rate_2').':', 'default_tax_1_rate',array('class'=>'wide')); ?>
+				<div class='form_field'>
+				<?php echo form_input(array(
+					'name'=>'default_tax_2_name',
+					'id'=>'default_tax_2_name',
+					'size'=>'10',
+					'value'=>$this->config->item('default_tax_2_name')!==FALSE ? $this->config->item('default_tax_2_name') : $this->lang->line('items_sales_tax_2')));?>
+					
+				<?php echo form_input(array(
+					'name'=>'default_tax_2_rate',
+					'id'=>'default_tax_2_rate',
+					'size'=>'4',
+					'value'=>$this->config->item('default_tax_2_rate')));?>%
+				</div>
+			</div>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_tax_included').':', 'tax_included',array('class'=>'wide')); ?>
+				<div class='form_field'>
+				<?php echo form_checkbox(array(
+					'name'=>'tax_included',
+					'id'=>'tax_included',
+					'value'=>'tax_included',
+					'checked'=>$this->config->item('tax_included')));?>
+				</div>
+			</div>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_default_sales_discount').':', 'default_sales_discount',array('class'=>'wide required')); ?>
+				<div class='form_field'>
+				<?php echo form_input(array(
+					'name'=>'default_sales_discount',
+					'id'=>'default_sales_discount',
+					'type'=>'number',
+					'min'=>0,
+					'max'=>100,
+					'value'=>$this->config->item('default_sales_discount')));?>
+				</div>
+			</div>
+
+			<div class="field_row clearfix">    
+			<?php echo form_label($this->lang->line('config_sales_invoice_format').':', 'sales_invoice_format',array('class'=>'wide')); ?>
+				<div class='form_field'>
+				<?php echo form_input(array(
+					'name'=>'sales_invoice_format',
+					'id'=>'sales_invoice_format',
+					'value'=>$this->config->item('sales_invoice_format'))); ?>
+				</div>
+			</div>
+
+			<div class="field_row clearfix">    
+			<?php echo form_label($this->lang->line('config_recv_invoice_format').':', 'recv_invoice_format',array('class'=>'wide')); ?>
+				<div class='form_field'>
+				<?php echo form_input(array(
+					'name'=>'recv_invoice_format',
+					'id'=>'recv_invoice_format',
+					'value'=>$this->config->item('recv_invoice_format'))); ?>
+				</div>
+			</div>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_receiving_calculate_average_price').':', 'receiving_calculate_average_price',array('class'=>'wide')); ?>
+				<div class='form_field'>
+				<?php echo form_checkbox(array(
+					'name'=>'receiving_calculate_average_price',
+					'id'=>'receiving_calculate_average_price',
+					'value'=>'receiving_calculate_average_price',
+					'checked'=>$this->config->item('receiving_calculate_average_price')));?>
+				</div>
+			</div>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_lines_per_page').':', 'lines_per_page',array('class'=>'wide required')); ?>
+				<div class='form_field'>
+				<?php echo form_input(array(
+					'name'=>'lines_per_page',
+					'id'=>'lines_per_page',
+					'type'=>'number',
+					'min'=>10,
+					'max'=>1000,
+					'value'=>$this->config->item('lines_per_page')));?>
+				</div>
+			</div>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_custom1').':', 'config_custom1',array('class'=>'wide')); ?>
+				<div class='form_field'>
+				<?php echo form_input(array(
+					'name'=>'custom1_name',
+					'id'=>'custom1_name',
+					'value'=>$this->config->item('custom1_name')));?>
+				</div>
+			</div>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_custom2').':', 'config_custom2',array('class'=>'wide')); ?>
+				<div class='form_field'>
+				<?php echo form_input(array(
+					'name'=>'custom2_name',
+					'id'=>'custom2_name',
+					'value'=>$this->config->item('custom2_name')));?>
+				</div>
+			</div>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_custom3').':', 'config_custom3',array('class'=>'wide')); ?>
+				<div class='form_field'>
+				<?php echo form_input(array(
+					'name'=>'custom3_name',
+					'id'=>'custom3_name',
+					'value'=>$this->config->item('custom3_name')));?>
+				</div>
+			</div>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_custom4').':', 'config_custom4',array('class'=>'wide')); ?>
+				<div class='form_field'>
+				<?php echo form_input(array(
+					'name'=>'custom4_name',
+					'id'=>'custom4_name',
+					'value'=>$this->config->item('custom4_name')));?>
+				</div>
+			</div>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_custom5').':', 'config_custom5',array('class'=>'wide')); ?>
+				<div class='form_field'>
+				<?php echo form_input(array(
+					'name'=>'custom5_name',
+					'id'=>'custom5_name',
+					'value'=>$this->config->item('custom5_name')));?>
+				</div>
+			</div>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_custom6').':', 'config_custom6',array('class'=>'wide')); ?>
+				<div class='form_field'>
+				<?php echo form_input(array(
+					'name'=>'custom6_name',
+					'id'=>'custom6_name',
+					'value'=>$this->config->item('custom6_name')));?>
+				</div>
+			</div>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_custom7').':', 'config_custom7',array('class'=>'wide')); ?>
+				<div class='form_field'>
+				<?php echo form_input(array(
+					'name'=>'custom7_name',
+					'id'=>'custom7_name',
+					'value'=>$this->config->item('custom7_name')));?>
+				</div>
+			</div>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_custom8').':', 'config_custom8',array('class'=>'wide')); ?>
+				<div class='form_field'>
+				<?php echo form_input(array(
+					'name'=>'custom8_name',
+					'id'=>'custom8_name',
+					'value'=>$this->config->item('custom8_name')));?>
+				</div>
+			</div>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_custom9').':', 'config_custom9',array('class'=>'wide')); ?>
+				<div class='form_field'>
+				<?php echo form_input(array(
+					'name'=>'custom9_name',
+					'id'=>'custom9_name',
+					'value'=>$this->config->item('custom9_name')));?>
+				</div>
+			</div>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_custom10').':', 'config_custom10',array('class'=>'wide')); ?>
+				<div class='form_field'>
+				<?php echo form_input(array(
+					'name'=>'custom10_name',
+					'id'=>'custom10_name',
+					'value'=>$this->config->item('custom10_name')));?>
+				</div>
+			</div>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_backup_database').':', 'config_backup_database',array('class'=>'wide')); ?>
+				<div id="backup_db" class="btn btn-primary btn-sm">
+					<span style="top:22%;"><?php echo $this->lang->line('config_backup_button'); ?></span>
+				</div>
+			</div>
+
+			<?php 
+			echo form_submit(array(
+				'name'=>'submit_form',
+				'id'=>'submit_form',
+				'value'=>$this->lang->line('common_submit'),
+				'class'=>'btn btn-primary btn-sm pull-right')
+			);
+			?>
+		</fieldset>
 	</div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_company_logo').':', 'company_logo',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	    <?php echo form_upload('company_logo');?>
-	</div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_address').':', 'address',array('class'=>'wide required')); ?>
-	<div class='form_field'>
-	<?php echo form_textarea(array(
-		'name'=>'address',
-		'id'=>'address',
-		'rows'=>4,
-		'cols'=>17,
-		'value'=>$this->config->item('address')));?>
-	</div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_website').':', 'website',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'website',
-		'id'=>'website',
-		'value'=>$this->config->item('website')));?>
-	</div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('common_email').':', 'email',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'email',
-		'id'=>'email',
-		'value'=>$this->config->item('email')));?>
-	</div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_phone').':', 'phone',array('class'=>'wide required')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'phone',
-		'id'=>'phone',
-		'value'=>$this->config->item('phone')));?>
-	</div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_fax').':', 'fax',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'fax',
-		'id'=>'fax',
-		'value'=>$this->config->item('fax')));?>
-	</div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('common_return_policy').':', 'return_policy',array('class'=>'wide required')); ?>
-	<div class='form_field'>
-	<?php echo form_textarea(array(
-		'name'=>'return_policy',
-		'id'=>'return_policy',
-		'rows'=>'4',
-		'cols'=>'17',
-		'value'=>$this->config->item('return_policy')));?>
-	</div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_default_tax_rate_1').':', 'default_tax_1_rate',array('class'=>'wide required')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'default_tax_1_name',
-		'id'=>'default_tax_1_name',
-		'size'=>'10',
-		'value'=>$this->config->item('default_tax_1_name')!==FALSE ? $this->config->item('default_tax_1_name') : $this->lang->line('items_sales_tax_1')));?>
-		
-	<?php echo form_input(array(
-		'name'=>'default_tax_1_rate',
-		'id'=>'default_tax_1_rate',
-		'size'=>'4',
-		'value'=>$this->config->item('default_tax_1_rate')));?>%
-	</div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_default_tax_rate_2').':', 'default_tax_1_rate',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'default_tax_2_name',
-		'id'=>'default_tax_2_name',
-		'size'=>'10',
-		'value'=>$this->config->item('default_tax_2_name')!==FALSE ? $this->config->item('default_tax_2_name') : $this->lang->line('items_sales_tax_2')));?>
-		
-	<?php echo form_input(array(
-		'name'=>'default_tax_2_rate',
-		'id'=>'default_tax_2_rate',
-		'size'=>'4',
-		'value'=>$this->config->item('default_tax_2_rate')));?>%
-	</div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_tax_included').':', 'tax_included',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_checkbox(array(
-		'name'=>'tax_included',
-		'id'=>'tax_included',
-		'value'=>'tax_included',
-		'checked'=>$this->config->item('tax_included')));?>
-	</div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_default_sales_discount').':', 'default_sales_discount',array('class'=>'wide required')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'default_sales_discount',
-		'id'=>'default_sales_discount',
-		'type'=>'number',
-		'min'=>0,
-		'max'=>100,
-		'value'=>$this->config->item('default_sales_discount')));?>
-	</div>
-</div>
-
-<div class="field_row clearfix">    
-<?php echo form_label($this->lang->line('config_sales_invoice_format').':', 'sales_invoice_format',array('class'=>'wide')); ?>
-    <div class='form_field'>
-    <?php echo form_input(array(
-        'name'=>'sales_invoice_format',
-        'id'=>'sales_invoice_format',
-        'value'=>$this->config->item('sales_invoice_format'))); ?>
-    </div>
-</div>
-
-<div class="field_row clearfix">    
-<?php echo form_label($this->lang->line('config_recv_invoice_format').':', 'recv_invoice_format',array('class'=>'wide')); ?>
-    <div class='form_field'>
-    <?php echo form_input(array(
-        'name'=>'recv_invoice_format',
-        'id'=>'recv_invoice_format',
-        'value'=>$this->config->item('recv_invoice_format'))); ?>
-    </div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_receiving_calculate_average_price').':', 'receiving_calculate_average_price',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_checkbox(array(
-		'name'=>'receiving_calculate_average_price',
-		'id'=>'receiving_calculate_average_price',
-		'value'=>'receiving_calculate_average_price',
-		'checked'=>$this->config->item('receiving_calculate_average_price')));?>
-	</div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_lines_per_page').':', 'lines_per_page',array('class'=>'wide required')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'lines_per_page',
-		'id'=>'lines_per_page',
-		'type'=>'number',
-		'min'=>10,
-		'max'=>1000,
-		'value'=>$this->config->item('lines_per_page')));?>
-	</div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_custom1').':', 'config_custom1',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'custom1_name',
-		'id'=>'custom1_name',
-		'value'=>$this->config->item('custom1_name')));?>
-	</div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_custom2').':', 'config_custom2',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'custom2_name',
-		'id'=>'custom2_name',
-		'value'=>$this->config->item('custom2_name')));?>
-	</div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_custom3').':', 'config_custom3',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'custom3_name',
-		'id'=>'custom3_name',
-		'value'=>$this->config->item('custom3_name')));?>
-	</div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_custom4').':', 'config_custom4',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'custom4_name',
-		'id'=>'custom4_name',
-		'value'=>$this->config->item('custom4_name')));?>
-	</div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_custom5').':', 'config_custom5',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'custom5_name',
-		'id'=>'custom5_name',
-		'value'=>$this->config->item('custom5_name')));?>
-	</div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_custom6').':', 'config_custom6',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'custom6_name',
-		'id'=>'custom6_name',
-		'value'=>$this->config->item('custom6_name')));?>
-	</div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_custom7').':', 'config_custom7',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'custom7_name',
-		'id'=>'custom7_name',
-		'value'=>$this->config->item('custom7_name')));?>
-	</div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_custom8').':', 'config_custom8',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'custom8_name',
-		'id'=>'custom8_name',
-		'value'=>$this->config->item('custom8_name')));?>
-	</div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_custom9').':', 'config_custom9',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'custom9_name',
-		'id'=>'custom9_name',
-		'value'=>$this->config->item('custom9_name')));?>
-	</div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_custom10').':', 'config_custom10',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'custom10_name',
-		'id'=>'custom10_name',
-		'value'=>$this->config->item('custom10_name')));?>
-	</div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_backup_database').':', 'config_backup_database',array('class'=>'wide')); ?>
-	<div id="backup_db" class="btn btn-primary btn-sm">
-		<span style="top:22%;"><?php echo $this->lang->line('config_backup_button'); ?></span>
-	</div>
-</div>
-
-<?php 
-echo form_submit(array(
-	'name'=>'submit_form',
-	'id'=>'submit_form',
-	'value'=>$this->lang->line('common_submit'),
-	'class'=>'btn btn-primary btn-sm pull-right')
-);
-?>
-</fieldset>
-</div>
-<?php
-echo form_close();
-?>
+<?php echo form_close(); ?>
 
 <script type='text/javascript'>
 
@@ -330,11 +327,11 @@ $(document).ready(function()
 			{
 				if(response.success)
 				{
-					set_feedback(response.message,'success_message',false);		
+					set_feedback(response.message, 'alert alert-dismissible alert-success', false);		
 				}
 				else
 				{
-					set_feedback(response.message,'error_message',true);		
+					set_feedback(response.message, 'alert alert-dismissible alert-danger', true);		
 				}
 			},
 			dataType:'json'
diff --git a/application/views/configs/locale_config.php b/application/views/configs/locale_config.php
index 538cd975b..a6b65e8ae 100644
--- a/application/views/configs/locale_config.php
+++ b/application/views/configs/locale_config.php
@@ -1,212 +1,209 @@
 <div id="page_title"><?php echo $this->lang->line('config_locale_configuration'); ?></div>
-<?php
-echo form_open('config/save_locale/',array('id'=>'locale_config_form'));
-?>
-<div id="config_wrapper">
-<fieldset id="config_info">
-<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
-<ul id="error_message_box" class="error_message_box"></ul>
-<legend><?php echo $this->lang->line("config_locale_info"); ?></legend>
 
-<div class="field_row clearfix">	
-	<?php echo form_label($this->lang->line('config_currency_symbol').':', 'currency_symbol',array('class'=>'wide')); ?>
-	<div class='form_field'>
-		<?php echo form_input(array(
-				'name'=>'currency_symbol',
-				'id'=>'currency_symbol',
-				'value'=>$this->config->item('currency_symbol')));?>
-	</div>
+<?php echo form_open('config/save_locale/',array('id'=>'locale_config_form')); ?>
+	<div id="config_wrapper">
+		<fieldset id="config_info">
+			<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+			<ul id="error_message_box" class="error_message_box"></ul>
+			<legend><?php echo $this->lang->line("config_locale_info"); ?></legend>
 
-	<?php echo form_label($this->lang->line('config_currency_side').':', 'currency_side',array('class'=>''));?>
-	<div class='form_field'>
-		<?php 
-			echo form_checkbox(array(
-				'name'=>'currency_side',
-				'id'=>'currency_side',
-				'value'=>'currency_side',
-				'checked'=>$this->config->item('currency_side')));?>
-	</div>
-</div>
+			<div class="field_row clearfix">	
+				<?php echo form_label($this->lang->line('config_currency_symbol').':', 'currency_symbol',array('class'=>'wide')); ?>
+				<div class='form_field'>
+					<?php echo form_input(array(
+							'name'=>'currency_symbol',
+							'id'=>'currency_symbol',
+							'value'=>$this->config->item('currency_symbol')));?>
+				</div>
 
-<div class="field_row clearfix">    
-<?php echo form_label($this->lang->line('config_number_format').':', 'number_format',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo $this->lang->line('config_thousands_separator'); ?>
-	<?php echo form_dropdown('thousands_separator', array(
-		        '&apos;' => '&apos; (apostrophe)',
-			','    => ', (comma)',
-			'.'    => '. (dot)',
-			''    => '(none)'
-			), 
-		$this->config->item('thousands_separator'));
-		?>
-	<?php echo $this->lang->line('config_decimal_point'); ?>
-	<?php echo form_dropdown('decimal_point', array(
-			'.'    => '. (dot)',
-			','    => ', (comma)'
-			), 
-		$this->config->item('decimal_point'));
-		?>
-	</div>
-</div>
+				<?php echo form_label($this->lang->line('config_currency_side').':', 'currency_side',array('class'=>''));?>
+				<div class='form_field'>
+					<?php 
+						echo form_checkbox(array(
+							'name'=>'currency_side',
+							'id'=>'currency_side',
+							'value'=>'currency_side',
+							'checked'=>$this->config->item('currency_side')));?>
+				</div>
+			</div>
 
-<div class="field_row clearfix">
-	<?php echo form_label($this->lang->line('config_language').':', 'language',array('class'=>'wide')); ?>
-	<div class='form_field'>
-		<?php echo form_dropdown('language', array(
-		'en' => 'English',
-		'es' => 'Spanish',
-		'ru' => 'Russian',
-		'nl-BE' => 'Dutch (Belgium)',
-		'de-CH' => 'German (Swiss)',
-		'zh' => 'Chinese',
-		'id' => 'Indonesian',
-		'fr'	=> 'French',
-		'th'	=> 'Thai',
-		'tr'	=> 'Turkish'
-		),
-		$this->config->item('language'));
-		?>
-	</div>
-</div>
+			<div class="field_row clearfix">    
+			<?php echo form_label($this->lang->line('config_number_format').':', 'number_format',array('class'=>'wide')); ?>
+				<div class='form_field'>
+				<?php echo $this->lang->line('config_thousands_separator'); ?>
+				<?php echo form_dropdown('thousands_separator', array(
+							'&apos;' => '&apos; (apostrophe)',
+						','    => ', (comma)',
+						'.'    => '. (dot)',
+						''    => '(none)'
+						), 
+					$this->config->item('thousands_separator'));
+					?>
+				<?php echo $this->lang->line('config_decimal_point'); ?>
+				<?php echo form_dropdown('decimal_point', array(
+						'.'    => '. (dot)',
+						','    => ', (comma)'
+						), 
+					$this->config->item('decimal_point'));
+					?>
+				</div>
+			</div>
 
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_timezone').':', 'timezone',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_dropdown('timezone', 
-	 array(
-		'Pacific/Midway'=>'(GMT-11:00) Midway Island, Samoa',
-		'America/Adak'=>'(GMT-10:00) Hawaii-Aleutian',
-		'Etc/GMT+10'=>'(GMT-10:00) Hawaii',
-		'Pacific/Marquesas'=>'(GMT-09:30) Marquesas Islands',
-		'Pacific/Gambier'=>'(GMT-09:00) Gambier Islands',
-		'America/Anchorage'=>'(GMT-09:00) Alaska',
-		'America/Ensenada'=>'(GMT-08:00) Tijuana, Baja California',
-		'Etc/GMT+8'=>'(GMT-08:00) Pitcairn Islands',
-		'America/Los_Angeles'=>'(GMT-08:00) Pacific Time (US & Canada)',
-		'America/Denver'=>'(GMT-07:00) Mountain Time (US & Canada)',
-		'America/Chihuahua'=>'(GMT-07:00) Chihuahua, La Paz, Mazatlan',
-		'America/Dawson_Creek'=>'(GMT-07:00) Arizona',
-		'America/Belize'=>'(GMT-06:00) Saskatchewan, Central America',
-		'America/Cancun'=>'(GMT-06:00) Guadalajara, Mexico City, Monterrey',
-		'Chile/EasterIsland'=>'(GMT-06:00) Easter Island',
-		'America/Chicago'=>'(GMT-06:00) Central Time (US & Canada)',
-		'America/New_York'=>'(GMT-05:00) Eastern Time (US & Canada)',
-		'America/Havana'=>'(GMT-05:00) Cuba',
-		'America/Bogota'=>'(GMT-05:00) Bogota, Lima, Quito, Rio Branco',
-		'America/Caracas'=>'(GMT-04:30) Caracas',
-		'America/Santiago'=>'(GMT-04:00) Santiago',
-		'America/La_Paz'=>'(GMT-04:00) La Paz',
-		'Atlantic/Stanley'=>'(GMT-04:00) Faukland Islands',
-		'America/Campo_Grande'=>'(GMT-04:00) Brazil',
-		'America/Goose_Bay'=>'(GMT-04:00) Atlantic Time (Goose Bay)',
-		'America/Glace_Bay'=>'(GMT-04:00) Atlantic Time (Canada)',
-		'America/St_Johns'=>'(GMT-03:30) Newfoundland',
-		'America/Araguaina'=>'(GMT-03:00) UTC-3',
-		'America/Montevideo'=>'(GMT-03:00) Montevideo',
-		'America/Miquelon'=>'(GMT-03:00) Miquelon, St. Pierre',
-		'America/Godthab'=>'(GMT-03:00) Greenland',
-		'America/Argentina/Buenos_Aires'=>'(GMT-03:00) Buenos Aires',
-		'America/Sao_Paulo'=>'(GMT-03:00) Brasilia',
-		'America/Noronha'=>'(GMT-02:00) Mid-Atlantic',
-		'Atlantic/Cape_Verde'=>'(GMT-01:00) Cape Verde Is.',
-		'Atlantic/Azores'=>'(GMT-01:00) Azores',
-		'Europe/Belfast'=>'(GMT) Greenwich Mean Time : Belfast',
-		'Europe/Dublin'=>'(GMT) Greenwich Mean Time : Dublin',
-		'Europe/Lisbon'=>'(GMT) Greenwich Mean Time : Lisbon',
-		'Europe/London'=>'(GMT) Greenwich Mean Time : London',
-		'Africa/Abidjan'=>'(GMT) Monrovia, Reykjavik',
-		'Europe/Amsterdam'=>'(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna',
-		'Europe/Belgrade'=>'(GMT+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague',
-		'Europe/Brussels'=>'(GMT+01:00) Brussels, Copenhagen, Madrid, Paris',
-		'Africa/Algiers'=>'(GMT+01:00) West Central Africa',
-		'Africa/Windhoek'=>'(GMT+01:00) Windhoek',
-		'Asia/Beirut'=>'(GMT+02:00) Beirut',
-		'Africa/Cairo'=>'(GMT+02:00) Cairo',
-		'Asia/Gaza'=>'(GMT+02:00) Gaza',
-		'Africa/Blantyre'=>'(GMT+02:00) Harare, Pretoria',
-		'Asia/Jerusalem'=>'(GMT+02:00) Jerusalem',
-		'Europe/Minsk'=>'(GMT+02:00) Minsk',
-		'Asia/Damascus'=>'(GMT+02:00) Syria',
-		'Europe/Moscow'=>'(GMT+03:00) Moscow, St. Petersburg, Volgograd',
-		'Africa/Addis_Ababa'=>'(GMT+03:00) Nairobi',
-		'Asia/Tehran'=>'(GMT+03:30) Tehran',
-		'Asia/Dubai'=>'(GMT+04:00) Abu Dhabi, Muscat',
-		'Asia/Yerevan'=>'(GMT+04:00) Yerevan',
-		'Asia/Kabul'=>'(GMT+04:30) Kabul',
-	 	'Asia/Baku'=>'(GMT+05:00) Baku',
-	 	'Asia/Yekaterinburg'=>'(GMT+05:00) Ekaterinburg',
-		'Asia/Tashkent'=>'(GMT+05:00) Tashkent',
-		'Asia/Kolkata'=>'(GMT+05:30) Chennai, Kolkata, Mumbai, New Delhi',
-		'Asia/Katmandu'=>'(GMT+05:45) Kathmandu',
-		'Asia/Dhaka'=>'(GMT+06:00) Astana, Dhaka',
-		'Asia/Novosibirsk'=>'(GMT+06:00) Novosibirsk',
-		'Asia/Rangoon'=>'(GMT+06:30) Yangon (Rangoon)',
-		'Asia/Bangkok'=>'(GMT+07:00) Bangkok, Hanoi, Jakarta',
-		'Asia/Krasnoyarsk'=>'(GMT+07:00) Krasnoyarsk',
-		'Asia/Hong_Kong'=>'(GMT+08:00) Beijing, Chongqing, Hong Kong, Urumqi',
-		'Asia/Irkutsk'=>'(GMT+08:00) Irkutsk, Ulaan Bataar',
-		'Australia/Perth'=>'(GMT+08:00) Perth',
-		'Australia/Eucla'=>'(GMT+08:45) Eucla',
-		'Asia/Tokyo'=>'(GMT+09:00) Osaka, Sapporo, Tokyo',
-		'Asia/Seoul'=>'(GMT+09:00) Seoul',
-		'Asia/Yakutsk'=>'(GMT+09:00) Yakutsk',
-		'Australia/Adelaide'=>'(GMT+09:30) Adelaide',
-		'Australia/Darwin'=>'(GMT+09:30) Darwin',
-		'Australia/Brisbane'=>'(GMT+10:00) Brisbane',
-		'Australia/Hobart'=>'(GMT+10:00) Hobart',
-		'Asia/Vladivostok'=>'(GMT+10:00) Vladivostok',
-		'Australia/Lord_Howe'=>'(GMT+10:30) Lord Howe Island',
-		'Etc/GMT-11'=>'(GMT+11:00) Solomon Is., New Caledonia',
-		'Asia/Magadan'=>'(GMT+11:00) Magadan',
-		'Pacific/Norfolk'=>'(GMT+11:30) Norfolk Island',
-		'Asia/Anadyr'=>'(GMT+12:00) Anadyr, Kamchatka',
-		'Pacific/Auckland'=>'(GMT+12:00) Auckland, Wellington',
-		'Etc/GMT-12'=>'(GMT+12:00) Fiji, Kamchatka, Marshall Is.',
-		'Pacific/Chatham'=>'(GMT+12:45) Chatham Islands',
-		'Pacific/Tongatapu'=>'(GMT+13:00) Nuku\'alofa',
-		'Pacific/Kiritimati'=>'(GMT+14:00) Kiritimati'
-		), $this->config->item('timezone') ? $this->config->item('timezone') : date_default_timezone_get());
-		?>
-	</div>
-</div>
+			<div class="field_row clearfix">
+				<?php echo form_label($this->lang->line('config_language').':', 'language',array('class'=>'wide')); ?>
+				<div class='form_field'>
+					<?php echo form_dropdown('language', array(
+					'en' => 'English',
+					'es' => 'Spanish',
+					'ru' => 'Russian',
+					'nl-BE' => 'Dutch (Belgium)',
+					'de-CH' => 'German (Swiss)',
+					'zh' => 'Chinese',
+					'id' => 'Indonesian',
+					'fr'	=> 'French',
+					'th'	=> 'Thai',
+					'tr'	=> 'Turkish'
+					),
+					$this->config->item('language'));
+					?>
+				</div>
+			</div>
 
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_datetimeformat').':', 'datetimeformat', array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_dropdown('dateformat', array(
-		'd/m/Y' => 'dd/mm/yyyy',
-		'm/d/Y' => 'mm/dd/yyyy',
-		'Y/m/d' => 'yyyy/mm/dd',
-		'd/m/y' => 'dd/mm/yy',
-		'm/d/y' => 'mm/dd/yy',
-		'y/m/d' => 'yy/mm/dd'), 
-		$this->config->item('dateformat'));
-		?>
-	</div>
-	<div class='form_field'>
-	<?php echo form_dropdown('timeformat', array(
-		'H:i:s' => 'hh:mm:ss (24h)',
-		'h:i:s a' => 'hh:mm:ss am/pm',
-		'h:i:s' => 'hh:mm:ss (12h)'),
-		$this->config->item('timeformat'));
-		?>
-	</div>
-</div>
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_timezone').':', 'timezone',array('class'=>'wide')); ?>
+				<div class='form_field'>
+				<?php echo form_dropdown('timezone', 
+				 array(
+					'Pacific/Midway'=>'(GMT-11:00) Midway Island, Samoa',
+					'America/Adak'=>'(GMT-10:00) Hawaii-Aleutian',
+					'Etc/GMT+10'=>'(GMT-10:00) Hawaii',
+					'Pacific/Marquesas'=>'(GMT-09:30) Marquesas Islands',
+					'Pacific/Gambier'=>'(GMT-09:00) Gambier Islands',
+					'America/Anchorage'=>'(GMT-09:00) Alaska',
+					'America/Ensenada'=>'(GMT-08:00) Tijuana, Baja California',
+					'Etc/GMT+8'=>'(GMT-08:00) Pitcairn Islands',
+					'America/Los_Angeles'=>'(GMT-08:00) Pacific Time (US & Canada)',
+					'America/Denver'=>'(GMT-07:00) Mountain Time (US & Canada)',
+					'America/Chihuahua'=>'(GMT-07:00) Chihuahua, La Paz, Mazatlan',
+					'America/Dawson_Creek'=>'(GMT-07:00) Arizona',
+					'America/Belize'=>'(GMT-06:00) Saskatchewan, Central America',
+					'America/Cancun'=>'(GMT-06:00) Guadalajara, Mexico City, Monterrey',
+					'Chile/EasterIsland'=>'(GMT-06:00) Easter Island',
+					'America/Chicago'=>'(GMT-06:00) Central Time (US & Canada)',
+					'America/New_York'=>'(GMT-05:00) Eastern Time (US & Canada)',
+					'America/Havana'=>'(GMT-05:00) Cuba',
+					'America/Bogota'=>'(GMT-05:00) Bogota, Lima, Quito, Rio Branco',
+					'America/Caracas'=>'(GMT-04:30) Caracas',
+					'America/Santiago'=>'(GMT-04:00) Santiago',
+					'America/La_Paz'=>'(GMT-04:00) La Paz',
+					'Atlantic/Stanley'=>'(GMT-04:00) Faukland Islands',
+					'America/Campo_Grande'=>'(GMT-04:00) Brazil',
+					'America/Goose_Bay'=>'(GMT-04:00) Atlantic Time (Goose Bay)',
+					'America/Glace_Bay'=>'(GMT-04:00) Atlantic Time (Canada)',
+					'America/St_Johns'=>'(GMT-03:30) Newfoundland',
+					'America/Araguaina'=>'(GMT-03:00) UTC-3',
+					'America/Montevideo'=>'(GMT-03:00) Montevideo',
+					'America/Miquelon'=>'(GMT-03:00) Miquelon, St. Pierre',
+					'America/Godthab'=>'(GMT-03:00) Greenland',
+					'America/Argentina/Buenos_Aires'=>'(GMT-03:00) Buenos Aires',
+					'America/Sao_Paulo'=>'(GMT-03:00) Brasilia',
+					'America/Noronha'=>'(GMT-02:00) Mid-Atlantic',
+					'Atlantic/Cape_Verde'=>'(GMT-01:00) Cape Verde Is.',
+					'Atlantic/Azores'=>'(GMT-01:00) Azores',
+					'Europe/Belfast'=>'(GMT) Greenwich Mean Time : Belfast',
+					'Europe/Dublin'=>'(GMT) Greenwich Mean Time : Dublin',
+					'Europe/Lisbon'=>'(GMT) Greenwich Mean Time : Lisbon',
+					'Europe/London'=>'(GMT) Greenwich Mean Time : London',
+					'Africa/Abidjan'=>'(GMT) Monrovia, Reykjavik',
+					'Europe/Amsterdam'=>'(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna',
+					'Europe/Belgrade'=>'(GMT+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague',
+					'Europe/Brussels'=>'(GMT+01:00) Brussels, Copenhagen, Madrid, Paris',
+					'Africa/Algiers'=>'(GMT+01:00) West Central Africa',
+					'Africa/Windhoek'=>'(GMT+01:00) Windhoek',
+					'Asia/Beirut'=>'(GMT+02:00) Beirut',
+					'Africa/Cairo'=>'(GMT+02:00) Cairo',
+					'Asia/Gaza'=>'(GMT+02:00) Gaza',
+					'Africa/Blantyre'=>'(GMT+02:00) Harare, Pretoria',
+					'Asia/Jerusalem'=>'(GMT+02:00) Jerusalem',
+					'Europe/Minsk'=>'(GMT+02:00) Minsk',
+					'Asia/Damascus'=>'(GMT+02:00) Syria',
+					'Europe/Moscow'=>'(GMT+03:00) Moscow, St. Petersburg, Volgograd',
+					'Africa/Addis_Ababa'=>'(GMT+03:00) Nairobi',
+					'Asia/Tehran'=>'(GMT+03:30) Tehran',
+					'Asia/Dubai'=>'(GMT+04:00) Abu Dhabi, Muscat',
+					'Asia/Yerevan'=>'(GMT+04:00) Yerevan',
+					'Asia/Kabul'=>'(GMT+04:30) Kabul',
+					'Asia/Baku'=>'(GMT+05:00) Baku',
+					'Asia/Yekaterinburg'=>'(GMT+05:00) Ekaterinburg',
+					'Asia/Tashkent'=>'(GMT+05:00) Tashkent',
+					'Asia/Kolkata'=>'(GMT+05:30) Chennai, Kolkata, Mumbai, New Delhi',
+					'Asia/Katmandu'=>'(GMT+05:45) Kathmandu',
+					'Asia/Dhaka'=>'(GMT+06:00) Astana, Dhaka',
+					'Asia/Novosibirsk'=>'(GMT+06:00) Novosibirsk',
+					'Asia/Rangoon'=>'(GMT+06:30) Yangon (Rangoon)',
+					'Asia/Bangkok'=>'(GMT+07:00) Bangkok, Hanoi, Jakarta',
+					'Asia/Krasnoyarsk'=>'(GMT+07:00) Krasnoyarsk',
+					'Asia/Hong_Kong'=>'(GMT+08:00) Beijing, Chongqing, Hong Kong, Urumqi',
+					'Asia/Irkutsk'=>'(GMT+08:00) Irkutsk, Ulaan Bataar',
+					'Australia/Perth'=>'(GMT+08:00) Perth',
+					'Australia/Eucla'=>'(GMT+08:45) Eucla',
+					'Asia/Tokyo'=>'(GMT+09:00) Osaka, Sapporo, Tokyo',
+					'Asia/Seoul'=>'(GMT+09:00) Seoul',
+					'Asia/Yakutsk'=>'(GMT+09:00) Yakutsk',
+					'Australia/Adelaide'=>'(GMT+09:30) Adelaide',
+					'Australia/Darwin'=>'(GMT+09:30) Darwin',
+					'Australia/Brisbane'=>'(GMT+10:00) Brisbane',
+					'Australia/Hobart'=>'(GMT+10:00) Hobart',
+					'Asia/Vladivostok'=>'(GMT+10:00) Vladivostok',
+					'Australia/Lord_Howe'=>'(GMT+10:30) Lord Howe Island',
+					'Etc/GMT-11'=>'(GMT+11:00) Solomon Is., New Caledonia',
+					'Asia/Magadan'=>'(GMT+11:00) Magadan',
+					'Pacific/Norfolk'=>'(GMT+11:30) Norfolk Island',
+					'Asia/Anadyr'=>'(GMT+12:00) Anadyr, Kamchatka',
+					'Pacific/Auckland'=>'(GMT+12:00) Auckland, Wellington',
+					'Etc/GMT-12'=>'(GMT+12:00) Fiji, Kamchatka, Marshall Is.',
+					'Pacific/Chatham'=>'(GMT+12:45) Chatham Islands',
+					'Pacific/Tongatapu'=>'(GMT+13:00) Nuku\'alofa',
+					'Pacific/Kiritimati'=>'(GMT+14:00) Kiritimati'
+					), $this->config->item('timezone') ? $this->config->item('timezone') : date_default_timezone_get());
+					?>
+				</div>
+			</div>
 
-<?php 
-echo form_submit(array(
-	'name'=>'submit_form',
-	'id'=>'submit_form',
-	'value'=>$this->lang->line('common_submit'),
-	'class'=>'btn btn-primary btn-sm pull-right')
-);
-?>
-</fieldset>
-</div>
-<?php
-echo form_close();
-?>
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_datetimeformat').':', 'datetimeformat', array('class'=>'wide')); ?>
+				<div class='form_field'>
+				<?php echo form_dropdown('dateformat', array(
+					'd/m/Y' => 'dd/mm/yyyy',
+					'm/d/Y' => 'mm/dd/yyyy',
+					'Y/m/d' => 'yyyy/mm/dd',
+					'd/m/y' => 'dd/mm/yy',
+					'm/d/y' => 'mm/dd/yy',
+					'y/m/d' => 'yy/mm/dd'), 
+					$this->config->item('dateformat'));
+					?>
+				</div>
+				<div class='form_field'>
+				<?php echo form_dropdown('timeformat', array(
+					'H:i:s' => 'hh:mm:ss (24h)',
+					'h:i:s a' => 'hh:mm:ss am/pm',
+					'h:i:s' => 'hh:mm:ss (12h)'),
+					$this->config->item('timeformat'));
+					?>
+				</div>
+			</div>
+
+			<?php 
+			echo form_submit(array(
+				'name'=>'submit_form',
+				'id'=>'submit_form',
+				'value'=>$this->lang->line('common_submit'),
+				'class'=>'btn btn-primary btn-sm pull-right')
+			);
+			?>
+		</fieldset>
+	</div>
+<?php echo form_close(); ?>
 
 <script type='text/javascript'>
 
@@ -221,11 +218,11 @@ $(document).ready(function()
 			{
 				if(response.success)
 				{
-					set_feedback(response.message,'success_message',false);		
+					set_feedback(response.message, 'alert alert-dismissible alert-success', false);		
 				}
 				else
 				{
-					set_feedback(response.message,'error_message',true);		
+					set_feedback(response.message, 'alert alert-dismissible alert-danger', true);		
 				}
 			},
 			dataType:'json'
diff --git a/application/views/configs/manage.php b/application/views/configs/manage.php
index c43680472..5167bc1d1 100644
--- a/application/views/configs/manage.php
+++ b/application/views/configs/manage.php
@@ -1,10 +1,12 @@
 <?php $this->load->view("partial/header"); ?>
+
 <link rel="stylesheet" rev="stylesheet" href="<?php echo base_url();?>css/tabcontent.css" />
 <script src="<?php echo base_url();?>js/tabcontent.js" type="text/javascript" language="javascript" charset="UTF-8"></script>
 
 <div id="title_bar">
     <div id="title" class="float_left"><?php echo $this->lang->line('module_config'); ?></div>
 </div>
+
 <ul class="tabs" data-persist="true">
     <li><a href="#general_config">General</a></li>
     <li><a href="#locale_config">Locale</a></li>
@@ -30,5 +32,5 @@
         <?php $this->load->view("configs/receipt_config"); ?>
     </div>
 </div>
-<div id="feedback_bar"></div>
+
 <?php $this->load->view("partial/footer"); ?>
\ No newline at end of file
diff --git a/application/views/configs/receipt_config.php b/application/views/configs/receipt_config.php
index d55ba7043..236ae048c 100644
--- a/application/views/configs/receipt_config.php
+++ b/application/views/configs/receipt_config.php
@@ -1,190 +1,187 @@
 <div id="page_title"><?php echo $this->lang->line('config_receipt_configuration'); ?></div>
-<?php
-echo form_open('config/save_receipt/',array('id'=>'receipt_config_form'));
-?>
-<div id="config_wrapper">
-<fieldset id="config_info">
-<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
-<ul id="receipt_error_message_box" class="error_message_box"></ul>
-<legend><?php echo $this->lang->line("config_receipt_info"); ?></legend>
 
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_use_invoice_template').':', 'use_invoice_template',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_checkbox(array(
-		'name'=>'use_invoice_template',
-		'value'=>'use_invoice_template',
-		'id'=>'use_invoice_template',
-		'checked'=>$this->config->item('use_invoice_template')));?>
+<?php echo form_open('config/save_receipt/',array('id'=>'receipt_config_form')); ?>
+	<div id="config_wrapper">
+		<fieldset id="config_info">
+			<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+			<ul id="receipt_error_message_box" class="error_message_box"></ul>
+			<legend><?php echo $this->lang->line("config_receipt_info"); ?></legend>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_use_invoice_template').':', 'use_invoice_template',array('class'=>'wide')); ?>
+				<div class='form_field'>
+				<?php echo form_checkbox(array(
+					'name'=>'use_invoice_template',
+					'value'=>'use_invoice_template',
+					'id'=>'use_invoice_template',
+					'checked'=>$this->config->item('use_invoice_template')));?>
+				</div>
+			</div>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_invoice_default_comments').':', 'invoice_default_comments',array('class'=>'wide')); ?>
+				<div class='form_field'>
+				<?php echo form_textarea(array(
+					'name'=>'invoice_default_comments',
+					'id'=>'invoice_default_comments',
+					'rows'=>4,
+					'cols'=>25,
+					'value'=>$this->config->item('invoice_default_comments')));?>
+				</div>
+			</div>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_invoice_email_message').':', 'invoice_email_message',array('class'=>'wide')); ?>
+				<div class='form_field'>
+				<?php echo form_textarea(array(
+					'name'=>'invoice_email_message',
+					'id'=>'invoice_email_message',
+					'rows'=>4,
+					'cols'=>25,
+					'value'=>$this->config->item('invoice_email_message')));?>
+				</div>
+			</div>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_receipt_show_taxes').':', 'receipt_show_taxes',array('class'=>'wide')); ?>
+				<div class='form_field'>
+				<?php echo form_checkbox(array(
+					'name'=>'receipt_show_taxes',
+					'value'=>'receipt_show_taxes',
+					'id'=>'receipt_show_taxes',
+					'checked'=>$this->config->item('receipt_show_taxes')));?>
+				</div>
+			</div>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_show_total_discount').':', 'show_total_discount',array('class'=>'wide')); ?>
+				<div class='form_field'>
+				<?php echo form_checkbox(array(
+					'name'=>'show_total_discount',
+					'value'=>'show_total_discount',
+					'id'=>'show_total_discount',
+					'checked'=>$this->config->item('show_total_discount')));?>
+				</div>
+			</div>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_print_silently').':', 'print_silently',array('class'=>'wide')); ?>
+				<div class='form_field'>
+				<?php echo form_checkbox(array(
+					'name'=>'print_silently',
+					'id'=>'print_silently',
+					'value'=>'print_silently',
+					'checked'=>$this->config->item('print_silently')));?>
+				</div>
+			</div>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_print_header').':', 'print_header',array('class'=>'wide')); ?>
+				<div class='form_field'>
+				<?php echo form_checkbox(array(
+					'name'=>'print_header',
+					'id'=>'print_header',
+					'value'=>'print_header',
+					'checked'=>$this->config->item('print_header')));?>
+				</div>
+			</div>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_print_footer').':', 'print_footer',array('class'=>'wide')); ?>
+				<div class='form_field'>
+				<?php echo form_checkbox(array(
+					'name'=>'print_footer',
+					'id'=>'print_footer',
+					'value'=>'print_footer',
+					'checked'=>$this->config->item('print_footer')));?>
+				</div>
+			</div>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_receipt_printer').':', 'config_receipt_printer',array('class'=>'wide')); ?>
+				<div class='form_field'>
+					<?php echo form_dropdown(
+						'receipt_printer',
+						array(),
+						'','id="receipt_printer"');?>
+				</div>
+			</div>
+
+			<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('config_invoice_printer').':', 'config_invoice_printer',array('class'=>'wide')); ?>
+				<div class='form_field'>
+					<?php echo form_dropdown('invoice_printer', array(), ' ','id="invoice_printer"');?>
+				</div>
+			</div>
+
+			<div class="field_row clearfix">    
+				<?php echo form_label($this->lang->line('config_print_top_margin').':', 'print_top_margin',array('class'=>'wide required')); ?>
+				<div class='form_field'>
+				<?php echo form_input(array(
+					'type'=>'number',
+					'min'=>'0',
+					'max'=>'20',
+					'name'=>'print_top_margin',
+					'id'=>'print_top_margin',
+					'value'=>$this->config->item('print_top_margin')));?>
+					 px
+				</div>
+			</div>
+
+			<div class="field_row clearfix">    
+				<?php echo form_label($this->lang->line('config_print_left_margin').':', 'print_left_margin',array('class'=>'wide required')); ?>
+				<div class='form_field'>
+				<?php echo form_input(array(
+					'type'=>'number',
+					'min'=>'0',
+					'max'=>'20',
+					'name'=>'print_left_margin',
+					'id'=>'print_left_margin',
+					'value'=>$this->config->item('print_left_margin')));?>
+					 px
+				</div>
+			</div>
+
+			<div class="field_row clearfix">    
+				<?php echo form_label($this->lang->line('config_print_bottom_margin').':', 'print_bottom_margin',array('class'=>'wide required')); ?>
+				<div class='form_field'>
+				<?php echo form_input(array(
+					'type'=>'number',
+					'min'=>'0',
+					'max'=>'20',
+					'name'=>'print_bottom_margin',
+					'id'=>'print_bottom_margin',
+					'value'=>$this->config->item('print_bottom_margin')));?>
+							px
+				</div>
+			</div>
+
+			<div class="field_row clearfix">    
+				<?php echo form_label($this->lang->line('config_print_right_margin').':', 'print_right_margin',array('class'=>'wide required')); ?>
+				<div class='form_field'>
+				<?php echo form_input(array(
+					'type'=>'number',
+					'min'=>'0',
+					'max'=>'20',
+					'name'=>'print_right_margin',
+					'id'=>'print_right_margin',
+					'value'=>$this->config->item('print_right_margin')));?>
+							px
+				</div>
+			</div>
+
+
+			<?php 
+			echo form_submit(array(
+				'name'=>'submit_form',
+				'id'=>'submit_form',
+				'value'=>$this->lang->line('common_submit'),
+				'class'=>'btn btn-primary btn-sm pull-right')
+			);
+			?>
+		</fieldset>
 	</div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_invoice_default_comments').':', 'invoice_default_comments',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_textarea(array(
-		'name'=>'invoice_default_comments',
-		'id'=>'invoice_default_comments',
-		'rows'=>4,
-		'cols'=>25,
-		'value'=>$this->config->item('invoice_default_comments')));?>
-	</div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_invoice_email_message').':', 'invoice_email_message',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_textarea(array(
-		'name'=>'invoice_email_message',
-		'id'=>'invoice_email_message',
-		'rows'=>4,
-		'cols'=>25,
-		'value'=>$this->config->item('invoice_email_message')));?>
-	</div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_receipt_show_taxes').':', 'receipt_show_taxes',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_checkbox(array(
-		'name'=>'receipt_show_taxes',
-		'value'=>'receipt_show_taxes',
-		'id'=>'receipt_show_taxes',
-		'checked'=>$this->config->item('receipt_show_taxes')));?>
-	</div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_show_total_discount').':', 'show_total_discount',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_checkbox(array(
-		'name'=>'show_total_discount',
-		'value'=>'show_total_discount',
-		'id'=>'show_total_discount',
-		'checked'=>$this->config->item('show_total_discount')));?>
-	</div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_print_silently').':', 'print_silently',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_checkbox(array(
-		'name'=>'print_silently',
-		'id'=>'print_silently',
-		'value'=>'print_silently',
-		'checked'=>$this->config->item('print_silently')));?>
-	</div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_print_header').':', 'print_header',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_checkbox(array(
-		'name'=>'print_header',
-		'id'=>'print_header',
-		'value'=>'print_header',
-		'checked'=>$this->config->item('print_header')));?>
-	</div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_print_footer').':', 'print_footer',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_checkbox(array(
-		'name'=>'print_footer',
-		'id'=>'print_footer',
-		'value'=>'print_footer',
-		'checked'=>$this->config->item('print_footer')));?>
-	</div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_receipt_printer').':', 'config_receipt_printer',array('class'=>'wide')); ?>
-	<div class='form_field'>
-		<?php echo form_dropdown(
-			'receipt_printer',
-			array(),
-			'','id="receipt_printer"');?>
-	</div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_invoice_printer').':', 'config_invoice_printer',array('class'=>'wide')); ?>
-	<div class='form_field'>
-		<?php echo form_dropdown('invoice_printer', array(), ' ','id="invoice_printer"');?>
-	</div>
-</div>
-
-<div class="field_row clearfix">    
- 	<?php echo form_label($this->lang->line('config_print_top_margin').':', 'print_top_margin',array('class'=>'wide required')); ?>
-    <div class='form_field'>
-    <?php echo form_input(array(
-     	'type'=>'number',
-      	'min'=>'0',
-      	'max'=>'20',
-        'name'=>'print_top_margin',
-        'id'=>'print_top_margin',
-        'value'=>$this->config->item('print_top_margin')));?>
-         px
-    </div>
-</div>
-
-<div class="field_row clearfix">    
- 	<?php echo form_label($this->lang->line('config_print_left_margin').':', 'print_left_margin',array('class'=>'wide required')); ?>
-    <div class='form_field'>
-    <?php echo form_input(array(
-     	'type'=>'number',
-      	'min'=>'0',
-       	'max'=>'20',
-        'name'=>'print_left_margin',
-        'id'=>'print_left_margin',
-        'value'=>$this->config->item('print_left_margin')));?>
-         px
-    </div>
-</div>
-
-<div class="field_row clearfix">    
- 	<?php echo form_label($this->lang->line('config_print_bottom_margin').':', 'print_bottom_margin',array('class'=>'wide required')); ?>
-    <div class='form_field'>
-    <?php echo form_input(array(
-        'type'=>'number',
-        'min'=>'0',
-        'max'=>'20',
-        'name'=>'print_bottom_margin',
-        'id'=>'print_bottom_margin',
-        'value'=>$this->config->item('print_bottom_margin')));?>
-                px
-    </div>
-</div>
-
-<div class="field_row clearfix">    
- 	<?php echo form_label($this->lang->line('config_print_right_margin').':', 'print_right_margin',array('class'=>'wide required')); ?>
-    <div class='form_field'>
-    <?php echo form_input(array(
-        'type'=>'number',
-        'min'=>'0',
-        'max'=>'20',
-        'name'=>'print_right_margin',
-        'id'=>'print_right_margin',
-        'value'=>$this->config->item('print_right_margin')));?>
-                px
-    </div>
-</div>
-
-
-<?php 
-echo form_submit(array(
-	'name'=>'submit_form',
-	'id'=>'submit_form',
-	'value'=>$this->lang->line('common_submit'),
-	'class'=>'btn btn-primary btn-sm pull-right')
-);
-?>
-</fieldset>
-</div>
-<?php
-echo form_close();
-?>
+<?php echo form_close(); ?>
 
 <script type='text/javascript'>
 
@@ -240,11 +237,11 @@ $(document).ready(function()
 			{
 				if(response.success)
 				{
-					set_feedback(response.message,'success_message',false);		
+					set_feedback(response.message, 'alert alert-dismissible alert-success', false);		
 				}
 				else
 				{
-					set_feedback(response.message,'error_message',true);		
+					set_feedback(response.message, 'alert alert-dismissible alert-danger', true);		
 				}
 				// set back disabled state
 				enable_disable_use_invoice_template();
diff --git a/application/views/configs/stock_config.php b/application/views/configs/stock_config.php
index 427b69d3c..daf6605eb 100644
--- a/application/views/configs/stock_config.php
+++ b/application/views/configs/stock_config.php
@@ -1,7 +1,6 @@
 <div id="page_title"><?php echo $this->lang->line('config_location_configuration'); ?></div>
-<?php
-echo form_open('config/save_locations/',array('id'=>'location_config_form'));
-?>
+
+<?php echo form_open('config/save_locations/',array('id'=>'location_config_form')); ?>
     <div id="config_wrapper">
         <fieldset id="config_info">
             <div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
@@ -22,9 +21,7 @@ echo form_open('config/save_locations/',array('id'=>'location_config_form'));
             ?>
         </fieldset>
     </div>
-<?php
-echo form_close();
-?>
+<?php echo form_close(); ?>
 
 
 <script type='text/javascript'>
@@ -96,11 +93,11 @@ $(document).ready(function()
 			{
 				if(response.success)
 				{
-					set_feedback(response.message,'success_message',false);		
+					set_feedback(response.message, 'alert alert-dismissible alert-success', false);		
 				}
 				else
 				{
-					set_feedback(response.message,'error_message',true);		
+					set_feedback(response.message, 'alert alert-dismissible alert-danger', true);		
 				}
 				$("#stock_locations").load('<?php echo site_url("config/stock_locations");?>', init_add_remove_locations);
 			},
diff --git a/application/views/customers/excel_import.php b/application/views/customers/excel_import.php
index 275bb7865..551ed4b86 100644
--- a/application/views/customers/excel_import.php
+++ b/application/views/customers/excel_import.php
@@ -1,35 +1,31 @@
-<?php
-echo form_open_multipart('customers/do_excel_import/',array('id'=>'item_form'));
-?>
-<div id="required_fields_message"><?php echo $this->lang->line('customers_import_items_excel'); ?></div>
-<ul id="error_message_box" class="error_message_box"></ul>
-<b><a href="<?php echo site_url('customers/excel'); ?>"><?php echo $this->lang->line('common_download_import_template'); ?></a></b>
-<fieldset id="item_basic_info">
-<legend><?php echo $this->lang->line('common_import'); ?></legend>
+<?php echo form_open_multipart('customers/do_excel_import/',array('id'=>'item_form')); ?>
+	<div id="required_fields_message"><?php echo $this->lang->line('customers_import_items_excel'); ?></div>
+	<ul id="error_message_box" class="error_message_box"></ul>
+	<b><a href="<?php echo site_url('customers/excel'); ?>"><?php echo $this->lang->line('common_download_import_template'); ?></a></b>
+	<fieldset id="item_basic_info">
+		<legend><?php echo $this->lang->line('common_import'); ?></legend>
 
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('common_import_file_path').':', 'name',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_upload(array(
-		'name'=>'file_path',
-		'id'=>'file_path',
-		'value'=>'')
-	);?>
-	</div>
-</div>
+		<div class="field_row clearfix">	
+		<?php echo form_label($this->lang->line('common_import_file_path').':', 'name',array('class'=>'wide')); ?>
+			<div class='form_field'>
+			<?php echo form_upload(array(
+				'name'=>'file_path',
+				'id'=>'file_path',
+				'value'=>'')
+			);?>
+			</div>
+		</div>
 
-<?php
-echo form_submit(array(
-	'name'=>'submitf',
-	'id'=>'submitf',
-	'value'=>$this->lang->line('common_submit'),
-	'class'=>'btn btn-primary btn-sm pull-right')
-);
-?>
-</fieldset>
-<?php 
-echo form_close();
-?>
+		<?php
+		echo form_submit(array(
+			'name'=>'submitf',
+			'id'=>'submitf',
+			'value'=>$this->lang->line('common_submit'),
+			'class'=>'btn btn-primary btn-sm pull-right')
+		);
+		?>
+	</fieldset>
+<?php echo form_close(); ?>
 <script type='text/javascript'>
 
 //validation and submit handling
diff --git a/application/views/customers/form.php b/application/views/customers/form.php
index 90c604780..22390a5a9 100644
--- a/application/views/customers/form.php
+++ b/application/views/customers/form.php
@@ -1,53 +1,50 @@
-<?php
-echo form_open('customers/save/'.$person_info->person_id,array('id'=>'customer_form'));
-?>
-<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
-<ul id="error_message_box" class="error_message_box"></ul>
-<fieldset id="customer_basic_info">
-<legend><?php echo $this->lang->line("customers_basic_information"); ?></legend>
-<?php $this->load->view("people/form_basic_info"); ?>
+<?php echo form_open('customers/save/'.$person_info->person_id,array('id'=>'customer_form')); ?>
+	<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+	<ul id="error_message_box" class="error_message_box"></ul>
+	<fieldset id="customer_basic_info">
+		<legend><?php echo $this->lang->line("customers_basic_information"); ?></legend>
+		<?php $this->load->view("people/form_basic_info"); ?>
 
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('customers_company_name').':', 'company_name'); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'company_name',
-		'value'=>$person_info->company_name)
-	);?>
-	</div>
-</div>
+		<div class="field_row clearfix">	
+		<?php echo form_label($this->lang->line('customers_company_name').':', 'company_name'); ?>
+			<div class='form_field'>
+			<?php echo form_input(array(
+				'name'=>'company_name',
+				'value'=>$person_info->company_name)
+			);?>
+			</div>
+		</div>
 
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('customers_account_number').':', 'account_number'); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'account_number',
-		'id'=>'account_number',
-		'class'=>'account_number',
-		'value'=>$person_info->account_number)
-	);?>
-	</div>
-</div>
+		<div class="field_row clearfix">	
+		<?php echo form_label($this->lang->line('customers_account_number').':', 'account_number'); ?>
+			<div class='form_field'>
+			<?php echo form_input(array(
+				'name'=>'account_number',
+				'id'=>'account_number',
+				'class'=>'account_number',
+				'value'=>$person_info->account_number)
+			);?>
+			</div>
+		</div>
 
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('customers_taxable').':', 'taxable'); ?>
-	<div class='form_field'>
-	<?php echo form_checkbox('taxable', '1', $person_info->taxable == '' ? TRUE : (boolean)$person_info->taxable);?>
-	</div>
-</div>
+		<div class="field_row clearfix">	
+		<?php echo form_label($this->lang->line('customers_taxable').':', 'taxable'); ?>
+			<div class='form_field'>
+			<?php echo form_checkbox('taxable', '1', $person_info->taxable == '' ? TRUE : (boolean)$person_info->taxable);?>
+			</div>
+		</div>
+
+		<?php
+		echo form_submit(array(
+			'name'=>'submit',
+			'id'=>'submit',
+			'value'=>$this->lang->line('common_submit'),
+			'class'=>'btn btn-primary btn-sm pull-right')
+		);
+		?>
+	</fieldset>
+<?php echo form_close(); ?>
 
-<?php
-echo form_submit(array(
-	'name'=>'submit',
-	'id'=>'submit',
-	'value'=>$this->lang->line('common_submit'),
-	'class'=>'btn btn-primary btn-sm pull-right')
-);
-?>
-</fieldset>
-<?php 
-echo form_close();
-?>
 <script type='text/javascript'>
 
 //validation and submit handling
diff --git a/application/views/employees/form.php b/application/views/employees/form.php
index 144a6ef0f..f2a8689c2 100644
--- a/application/views/employees/form.php
+++ b/application/views/employees/form.php
@@ -1,106 +1,101 @@
-<?php
-echo form_open('employees/save/'.$person_info->person_id,array('id'=>'employee_form'));
-?>
-<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
-<ul id="error_message_box" class="error_message_box"></ul>
-<fieldset id="employee_basic_info">
-<legend><?php echo $this->lang->line("employees_basic_information"); ?></legend>
-<?php $this->load->view("people/form_basic_info"); ?>
-</fieldset>
+<?php echo form_open('employees/save/'.$person_info->person_id,array('id'=>'employee_form')); ?>
+	<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+	<ul id="error_message_box" class="error_message_box"></ul>
+	<fieldset id="employee_basic_info">
+		<legend><?php echo $this->lang->line("employees_basic_information"); ?></legend>
+		<?php $this->load->view("people/form_basic_info"); ?>
+	</fieldset>
 
-<fieldset id="employee_login_info">
-<legend><?php echo $this->lang->line("employees_login_info"); ?></legend>
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('employees_username').':', 'username',array('class'=>'required')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'username',
-		'id'=>'username',
-		'value'=>$person_info->username));?>
-	</div>
-</div>
+	<fieldset id="employee_login_info">
+		<legend><?php echo $this->lang->line("employees_login_info"); ?></legend>
+		<div class="field_row clearfix">	
+		<?php echo form_label($this->lang->line('employees_username').':', 'username',array('class'=>'required')); ?>
+			<div class='form_field'>
+			<?php echo form_input(array(
+				'name'=>'username',
+				'id'=>'username',
+				'value'=>$person_info->username));?>
+			</div>
+		</div>
 
-<?php
-$password_label_attributes = $person_info->person_id == "" ? array('class'=>'required'):array();
-?>
+		<?php
+		$password_label_attributes = $person_info->person_id == "" ? array('class'=>'required'):array();
+		?>
 
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('employees_password').':', 'password',$password_label_attributes); ?>
-	<div class='form_field'>
-	<?php echo form_password(array(
-		'name'=>'password',
-		'id'=>'password'
-	));?>
-	</div>
-</div>
+		<div class="field_row clearfix">	
+		<?php echo form_label($this->lang->line('employees_password').':', 'password',$password_label_attributes); ?>
+			<div class='form_field'>
+			<?php echo form_password(array(
+				'name'=>'password',
+				'id'=>'password'
+			));?>
+			</div>
+		</div>
 
+		<div class="field_row clearfix">	
+		<?php echo form_label($this->lang->line('employees_repeat_password').':', 'repeat_password',$password_label_attributes); ?>
+			<div class='form_field'>
+			<?php echo form_password(array(
+				'name'=>'repeat_password',
+				'id'=>'repeat_password'
+			));?>
+			</div>
+		</div>
+	</fieldset>
 
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('employees_repeat_password').':', 'repeat_password',$password_label_attributes); ?>
-	<div class='form_field'>
-	<?php echo form_password(array(
-		'name'=>'repeat_password',
-		'id'=>'repeat_password'
-	));?>
-	</div>
-</div>
-</fieldset>
+	<fieldset id="employee_permission_info">
+		<legend><?php echo $this->lang->line("employees_permission_info"); ?></legend>
+		<p><?php echo $this->lang->line("employees_permission_desc"); ?></p>
 
-<fieldset id="employee_permission_info">
-<legend><?php echo $this->lang->line("employees_permission_info"); ?></legend>
-<p><?php echo $this->lang->line("employees_permission_desc"); ?></p>
-
-<ul id="permission_list">
-<?php
-foreach($all_modules->result() as $module)
-{
-?>
-<li>	
-<?php echo form_checkbox("grants[]",$module->module_id,$this->Employee->has_grant($module->module_id,$person_info->person_id),"class='module'"); ?>
-<span class="medium"><?php echo $this->lang->line('module_'.$module->module_id);?>:</span>
-<span class="small"><?php echo $this->lang->line('module_'.$module->module_id.'_desc');?></span>
-<?php
-	foreach($all_subpermissions->result() as $permission)
-	{
-		$exploded_permission = explode('_', $permission->permission_id);
-		if ($permission->module_id == $module->module_id)
+		<ul id="permission_list">
+		<?php
+		foreach($all_modules->result() as $module)
 		{
-			$lang_key = $module->module_id.'_'.$exploded_permission[1];
-			$lang_line = $this->lang->line($lang_key);
-			$lang_line = ($this->lang->line_tbd($lang_key) == $lang_line) ? $exploded_permission[1] : $lang_line;
-			if (empty($lang_line))
+		?>
+		<li>	
+		<?php echo form_checkbox("grants[]",$module->module_id,$this->Employee->has_grant($module->module_id,$person_info->person_id),"class='module'"); ?>
+		<span class="medium"><?php echo $this->lang->line('module_'.$module->module_id);?>:</span>
+		<span class="small"><?php echo $this->lang->line('module_'.$module->module_id.'_desc');?></span>
+		<?php
+			foreach($all_subpermissions->result() as $permission)
 			{
-				continue;
-			} 
-			?>
-		<ul>
-			<li>
-			<?php echo form_checkbox("grants[]",$permission->permission_id,$this->Employee->has_grant($permission->permission_id,$person_info->person_id)); ?>
-			<span class="medium"><?php echo $lang_line ?></span>
-			</li>
-		</ul>
-			<?php 
+				$exploded_permission = explode('_', $permission->permission_id);
+				if ($permission->module_id == $module->module_id)
+				{
+					$lang_key = $module->module_id.'_'.$exploded_permission[1];
+					$lang_line = $this->lang->line($lang_key);
+					$lang_line = ($this->lang->line_tbd($lang_key) == $lang_line) ? $exploded_permission[1] : $lang_line;
+					if (empty($lang_line))
+					{
+						continue;
+					} 
+					?>
+				<ul>
+					<li>
+					<?php echo form_checkbox("grants[]",$permission->permission_id,$this->Employee->has_grant($permission->permission_id,$person_info->person_id)); ?>
+					<span class="medium"><?php echo $lang_line ?></span>
+					</li>
+				</ul>
+					<?php 
+				}
+			}
 		}
-	}
-}
-?>
-</li>
-</ul>
-<?php
-echo form_submit(array(
-	'name'=>'submit',
-	'id'=>'submit',
-	'value'=>$this->lang->line('common_submit'),
-	'class'=>'btn btn-primary btn-sm pull-right')
-);
+		?>
+		</li>
+		</ul>
+		<?php
+		echo form_submit(array(
+			'name'=>'submit',
+			'id'=>'submit',
+			'value'=>$this->lang->line('common_submit'),
+			'class'=>'btn btn-primary btn-sm pull-right')
+		);
+
+		?>
+	</fieldset>
+<?php echo form_close(); ?>
 
-?>
-</fieldset>
-<?php 
-echo form_close();
-?>
 <script type='text/javascript'>
-
 //validation and submit handling
 $(document).ready(function()
 {
diff --git a/application/views/giftcards/form.php b/application/views/giftcards/form.php
index 6f8b773d8..16ac666bd 100644
--- a/application/views/giftcards/form.php
+++ b/application/views/giftcards/form.php
@@ -1,58 +1,55 @@
 <div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
 <ul id="error_message_box" class="error_message_box"></ul>
-<?php
-echo form_open('giftcards/save/'.$giftcard_info->giftcard_id,array('id'=>'giftcard_form'));
-?>
-<fieldset id="giftcard_basic_info" style="padding: 5px;">
-<legend><?php echo $this->lang->line("giftcards_basic_information"); ?></legend>
 
-<div class="field_row clearfix">
-<?php echo form_label($this->lang->line('giftcards_person_id').':', 'name',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'person_id',
-		'id'=>'person_id',
-		'value'=>$selected_person)
-	);?>
-	</div>
-</div>
+<?php echo form_open('giftcards/save/'.$giftcard_info->giftcard_id,array('id'=>'giftcard_form')); ?>
+	<fieldset id="giftcard_basic_info" style="padding: 5px;">
+		<legend><?php echo $this->lang->line("giftcards_basic_information"); ?></legend>
 
-<div class="field_row clearfix">
-<?php echo form_label($this->lang->line('giftcards_giftcard_number').':', 'name',array('class'=>'required wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'giftcard_number',
-		'id'=>'giftcard_number',
-		'value'=>$giftcard_number)
-	);?>
-	</div>
-</div>
+		<div class="field_row clearfix">
+		<?php echo form_label($this->lang->line('giftcards_person_id').':', 'name',array('class'=>'wide')); ?>
+			<div class='form_field'>
+			<?php echo form_input(array(
+				'name'=>'person_id',
+				'id'=>'person_id',
+				'value'=>$selected_person)
+			);?>
+			</div>
+		</div>
 
-<div class="field_row clearfix">
-<?php echo form_label($this->lang->line('giftcards_card_value').':', 'name',array('class'=>'required wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'value',
-		'id'=>'value',
-		'value'=>$giftcard_info->value)
-	);?>
-	</div>
-</div>
+		<div class="field_row clearfix">
+		<?php echo form_label($this->lang->line('giftcards_giftcard_number').':', 'name',array('class'=>'required wide')); ?>
+			<div class='form_field'>
+			<?php echo form_input(array(
+				'name'=>'giftcard_number',
+				'id'=>'giftcard_number',
+				'value'=>$giftcard_number)
+			);?>
+			</div>
+		</div>
+
+		<div class="field_row clearfix">
+		<?php echo form_label($this->lang->line('giftcards_card_value').':', 'name',array('class'=>'required wide')); ?>
+			<div class='form_field'>
+			<?php echo form_input(array(
+				'name'=>'value',
+				'id'=>'value',
+				'value'=>$giftcard_info->value)
+			);?>
+			</div>
+		</div>
+
+		<?php
+		echo form_submit(array(
+			'name'=>'submit',
+			'id'=>'submit',
+			'value'=>$this->lang->line('common_submit'),
+			'class'=>'btn btn-primary btn-sm pull-right')
+		);
+		?>
+	</fieldset>
+<?php echo form_close(); ?>
 
-<?php
-echo form_submit(array(
-	'name'=>'submit',
-	'id'=>'submit',
-	'value'=>$this->lang->line('common_submit'),
-	'class'=>'btn btn-primary btn-sm pull-right')
-);
-?>
-</fieldset>
-<?php
-echo form_close();
-?>
 <script type='text/javascript'>
-
 //validation and submit handling
 $(document).ready(function()
 {
diff --git a/application/views/giftcards/manage.php b/application/views/giftcards/manage.php
index 4e4d0c42c..8955150a8 100644
--- a/application/views/giftcards/manage.php
+++ b/application/views/giftcards/manage.php
@@ -32,7 +32,7 @@ function post_giftcard_form_submit(response)
 {
 	if(!response.success)
 	{
-		set_feedback(response.message,'error_message',true);
+		set_feedback(response.message, 'alert alert-dismissible alert-danger', true);
 	}
 	else
 	{
@@ -40,7 +40,7 @@ function post_giftcard_form_submit(response)
 		if(jQuery.inArray(response.giftcard_id,get_visible_checkbox_ids()) != -1)
 		{
 			update_row(response.giftcard_id,'<?php echo site_url("$controller_name/get_row")?>');
-			set_feedback(response.message,'success_message',false);
+			set_feedback(response.message, 'alert alert-dismissible alert-success', false);
 
 		}
 		else //refresh entire table
@@ -49,7 +49,7 @@ function post_giftcard_form_submit(response)
 			{
 				//highlight new row
 				hightlight_row(response.giftcard_id);
-				set_feedback(response.message,'success_message',false);
+				set_feedback(response.message, 'alert alert-dismissible alert-success', false);
 			});
 		}
 	}
@@ -63,22 +63,25 @@ function post_giftcard_form_submit(response)
 	array('class'=>'thickbox none', 'title'=>$this->lang->line($controller_name.'_new')));
 	?>
 </div>
+
 <div id="pagination"><?= $links ?></div>
+
 <div id="table_action_header">
 	<ul>
 		<li class="float_left"><span><?php echo anchor("$controller_name/delete",$this->lang->line("common_delete"),array('id'=>'delete')); ?></span></li>
 		<li class="float_right">
-		<img src='<?php echo base_url()?>images/spinner_small.gif' alt='spinner' id='spinner' />
-		<?php echo form_open("$controller_name/search",array('id'=>'search_form')); ?>
-		<input type="text" name ='search' id='search'/>
-		<input type="hidden" name ='limit_from' id='limit_from'/>
-		</form>
+			<img src='<?php echo base_url()?>images/spinner_small.gif' alt='spinner' id='spinner' />
+
+			<?php echo form_open("$controller_name/search",array('id'=>'search_form')); ?>
+				<input type="text" name ='search' id='search'/>
+				<input type="hidden" name ='limit_from' id='limit_from'/>
+			<?php echo form_close(); ?>
 		</li>
 	</ul>
 </div>
 
 <div id="table_holder">
-<?php echo $manage_table; ?>
+	<?php echo $manage_table; ?>
 </div>
-<div id="feedback_bar"></div>
+
 <?php $this->load->view("partial/footer"); ?>
\ No newline at end of file
diff --git a/application/views/home.php b/application/views/home.php
index 9fed3613d..da43e6629 100644
--- a/application/views/home.php
+++ b/application/views/home.php
@@ -15,4 +15,5 @@
 	}
 	?>
 </div>
+
 <?php $this->load->view("partial/footer"); ?>
\ No newline at end of file
diff --git a/application/views/item_kits/form.php b/application/views/item_kits/form.php
index b3129d800..51c8d22c6 100644
--- a/application/views/item_kits/form.php
+++ b/application/views/item_kits/form.php
@@ -1,78 +1,75 @@
 <div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
 <ul id="error_message_box" class="error_message_box"></ul>
-<?php
-echo form_open('item_kits/save/'.$item_kit_info->item_kit_id,array('id'=>'item_kit_form'));
-?>
-<fieldset id="item_kit_info">
-<legend><?php echo $this->lang->line("item_kits_info"); ?></legend>
 
-<div class="field_row clearfix">
-<?php echo form_label($this->lang->line('item_kits_name').':', 'name',array('class'=>'wide required')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'name',
-		'id'=>'name',
-		'value'=>$item_kit_info->name)
-	);?>
-	</div>
-</div>
+<?php echo form_open('item_kits/save/'.$item_kit_info->item_kit_id,array('id'=>'item_kit_form')); ?>
+	<fieldset id="item_kit_info">
+		<legend><?php echo $this->lang->line("item_kits_info"); ?></legend>
 
-<div class="field_row clearfix">
-<?php echo form_label($this->lang->line('item_kits_description').':', 'description',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_textarea(array(
-		'name'=>'description',
-		'id'=>'description',
-		'value'=>$item_kit_info->description,
-		'rows'=>'5',
-		'cols'=>'17')
-	);?>
-	</div>
-</div>
+		<div class="field_row clearfix">
+		<?php echo form_label($this->lang->line('item_kits_name').':', 'name',array('class'=>'wide required')); ?>
+			<div class='form_field'>
+			<?php echo form_input(array(
+				'name'=>'name',
+				'id'=>'name',
+				'value'=>$item_kit_info->name)
+			);?>
+			</div>
+		</div>
+
+		<div class="field_row clearfix">
+		<?php echo form_label($this->lang->line('item_kits_description').':', 'description',array('class'=>'wide')); ?>
+			<div class='form_field'>
+			<?php echo form_textarea(array(
+				'name'=>'description',
+				'id'=>'description',
+				'value'=>$item_kit_info->description,
+				'rows'=>'5',
+				'cols'=>'17')
+			);?>
+			</div>
+		</div>
 
 
-<div class="field_row clearfix">
-<?php echo form_label($this->lang->line('item_kits_add_item').':', 'item',array('class'=>'wide')); ?>
-	<div class='form_field'>
-		<?php echo form_input(array(
-			'name'=>'item',
-			'id'=>'item'
-		));?>
-	</div>
-</div>
+		<div class="field_row clearfix">
+		<?php echo form_label($this->lang->line('item_kits_add_item').':', 'item',array('class'=>'wide')); ?>
+			<div class='form_field'>
+				<?php echo form_input(array(
+					'name'=>'item',
+					'id'=>'item'
+				));?>
+			</div>
+		</div>
+
+		<table id="item_kit_items">
+			<tr>
+				<th><?php echo $this->lang->line('common_delete');?></th>
+				<th><?php echo $this->lang->line('item_kits_item');?></th>
+				<th><?php echo $this->lang->line('item_kits_quantity');?></th>
+			</tr>
+			
+			<?php foreach ($this->Item_kit_items->get_info($item_kit_info->item_kit_id) as $item_kit_item) {?>
+				<tr>
+					<?php
+					$item_info = $this->Item->get_info($item_kit_item['item_id']);
+					?>
+					<td><a href="#" onclick='return deleteItemKitRow(this);'>X</a></td>
+					<td><?php echo $item_info->name; ?></td>
+					<td><input class='quantity' id='item_kit_item_<?php echo $item_kit_item['item_id'] ?>' type='text' size='3' name=item_kit_item[<?php echo $item_kit_item['item_id'] ?>] value='<?php echo $item_kit_item['quantity'] ?>'/></td>
+				</tr>
+			<?php } ?>
+		</table>
+		<?php
+		echo form_submit(array(
+			'name'=>'submit',
+			'id'=>'submit',
+			'value'=>$this->lang->line('common_submit'),
+			'class'=>'btn btn-primary btn-sm pull-right')
+		);
+		?>
+	</fieldset>
+<?php echo form_close(); ?>
 
-<table id="item_kit_items">
-	<tr>
-		<th><?php echo $this->lang->line('common_delete');?></th>
-		<th><?php echo $this->lang->line('item_kits_item');?></th>
-		<th><?php echo $this->lang->line('item_kits_quantity');?></th>
-	</tr>
-	
-	<?php foreach ($this->Item_kit_items->get_info($item_kit_info->item_kit_id) as $item_kit_item) {?>
-		<tr>
-			<?php
-			$item_info = $this->Item->get_info($item_kit_item['item_id']);
-			?>
-			<td><a href="#" onclick='return deleteItemKitRow(this);'>X</a></td>
-			<td><?php echo $item_info->name; ?></td>
-			<td><input class='quantity' id='item_kit_item_<?php echo $item_kit_item['item_id'] ?>' type='text' size='3' name=item_kit_item[<?php echo $item_kit_item['item_id'] ?>] value='<?php echo $item_kit_item['quantity'] ?>'/></td>
-		</tr>
-	<?php } ?>
-</table>
-<?php
-echo form_submit(array(
-	'name'=>'submit',
-	'id'=>'submit',
-	'value'=>$this->lang->line('common_submit'),
-	'class'=>'btn btn-primary btn-sm pull-right')
-);
-?>
-</fieldset>
-<?php
-echo form_close();
-?>
 <script type='text/javascript'>
-
 $("#item").autocomplete('<?php echo site_url("items/item_search"); ?>',
 {
 	minChars:0,
diff --git a/application/views/item_kits/manage.php b/application/views/item_kits/manage.php
index d5e92512e..8ef25cda6 100644
--- a/application/views/item_kits/manage.php
+++ b/application/views/item_kits/manage.php
@@ -45,7 +45,7 @@ function post_item_kit_form_submit(response)
 {
 	if(!response.success)
 	{
-		set_feedback(response.message,'error_message',true);
+		set_feedback(response.message, 'alert alert-dismissible alert-danger', true);
 	}
 	else
 	{
@@ -53,7 +53,7 @@ function post_item_kit_form_submit(response)
 		if(jQuery.inArray(response.item_kit_id,get_visible_checkbox_ids()) != -1)
 		{
 			update_row(response.item_kit_id,'<?php echo site_url("$controller_name/get_row")?>');
-			set_feedback(response.message,'success_message',false);
+			set_feedback(response.message, 'alert alert-dismissible alert-success', false);
 
 		}
 		else //refresh entire table
@@ -62,7 +62,7 @@ function post_item_kit_form_submit(response)
 			{
 				//highlight new row
 				hightlight_row(response.item_kit_id);
-				set_feedback(response.message,'success_message',false);
+				set_feedback(response.message, 'alert alert-dismissible alert-success', false);
 			});
 		}
 	}
@@ -78,25 +78,23 @@ function post_item_kit_form_submit(response)
 </div>
 
 <div id="pagination"><?= $links ?></div>
-<?php echo form_open("$controller_name/search",array('id'=>'search_form')); ?>
-<div id="table_action_header">
-	<ul>
-		<li class="float_left"><span><?php echo anchor("$controller_name/delete",$this->lang->line("common_delete"),array('id'=>'delete')); ?></span></li>
-		<li class="float_left"><span><?php echo anchor("$controller_name/generate_barcodes",$this->lang->line("items_generate_barcodes"),array('id'=>'generate_barcodes', 'target' =>'_blank','title'=>$this->lang->line('items_generate_barcodes'))); ?></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'/>
-			<input type="hidden" name ='limit_from' id='limit_from'/>
-		</li>
-	</ul>
-</div>
 
+<?php echo form_open("$controller_name/search",array('id'=>'search_form')); ?>
+	<div id="table_action_header">
+		<ul>
+			<li class="float_left"><span><?php echo anchor("$controller_name/delete",$this->lang->line("common_delete"),array('id'=>'delete')); ?></span></li>
+			<li class="float_left"><span><?php echo anchor("$controller_name/generate_barcodes",$this->lang->line("items_generate_barcodes"),array('id'=>'generate_barcodes', 'target' =>'_blank','title'=>$this->lang->line('items_generate_barcodes'))); ?></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'/>
+				<input type="hidden" name ='limit_from' id='limit_from'/>
+			</li>
+		</ul>
+	</div>
 <?php echo form_close(); ?>
 
 <div id="table_holder">
 	<?php echo $manage_table; ?>
 </div>
 
-<div id="feedback_bar"></div>
-
 <?php $this->load->view("partial/footer"); ?>
\ No newline at end of file
diff --git a/application/views/items/count_details.php b/application/views/items/count_details.php
index 276f4e08b..ed2cfe59f 100644
--- a/application/views/items/count_details.php
+++ b/application/views/items/count_details.php
@@ -1,104 +1,101 @@
-<?php
-echo form_open('items/save_inventory/'.$item_info->item_id,array('id'=>'item_form'));
-?>
-<fieldset id="inv_item_basic_info">
-<legend><?php echo $this->lang->line("items_basic_information"); ?></legend>
+<?php echo form_open('items/save_inventory/'.$item_info->item_id,array('id'=>'item_form')); ?>
+	<fieldset id="inv_item_basic_info">
+		<legend><?php echo $this->lang->line("items_basic_information"); ?></legend>
 
-<table align="center" border="0" bgcolor="#CCCCCC">
-<div class="field_row clearfix">
-<tr>
-<td>	
-<?php echo form_label($this->lang->line('items_item_number').':', 'name',array('class'=>'wide')); ?>
-</td>
-<td>
-	<?php $inumber = array (
-		'name'=>'item_number',
-		'id'=>'item_number',
-		'value'=>$item_info->item_number,
-		'style'       => 'border:none',
-		'readonly' => 'readonly'
-	);
-	
-		echo form_input($inumber)
-	?>
-</td>
-</tr>
-<tr>
-<td>	
-<?php echo form_label($this->lang->line('items_name').':', 'name',array('class'=>'wide')); ?>
-</td>
-<td>	
-	<?php $iname = array (
-		'name'=>'name',
-		'id'=>'name',
-		'value'=>$item_info->name,
-		'style'       => 'border:none',
-		'readonly' => 'readonly'
-	);
-		echo form_input($iname);
-		?>
-</td>
-</tr>
-<tr>
-<td>	
-<?php echo form_label($this->lang->line('items_category').':', 'category',array('class'=>'wide')); ?>
-</td>
-<td>	
-	<?php $cat = array (
-		
-		'name'=>'category',
-		'id'=>'category',
-		'value'=>$item_info->category,
-		'style'       => 'border:none',
-		'readonly' => 'readonly'
-		);
-	
-		echo form_input($cat);
-		?>
-</td>
-</tr>
-<tr>
-<td>
-<?php echo form_label($this->lang->line('items_stock_location').':', 'stock_location',array('class'=>'wide')); ?>
-</td>
-<td>
-    <?php 
-        echo form_dropdown('stock_location',$stock_locations,current($stock_locations),'onchange="display_stock(this.value)"');
-    ?> 
-</td>
-</tr>
-<tr>
-<td>
-<?php echo form_label($this->lang->line('items_current_quantity').':', 'quantity',array('class'=>'wide')); ?>
-</td>
-<td>
-	<?php $qty = array (
-	
-		'name'=>'quantity',
-		'id'=>'quantity',
-		'value'=>current($item_quantities),
-		'style'       => 'border:none',
-		'readonly' => 'readonly'
-		);
-	
-		echo form_input($qty);
-	?>
-</td>
-</tr>
-</div>	
-</table>
+		<table align="center" border="0" bgcolor="#CCCCCC">
+			<div class="field_row clearfix">
+			<tr>
+			<td>	
+				<?php echo form_label($this->lang->line('items_item_number').':', 'name',array('class'=>'wide')); ?>
+			</td>
+			<td>
+				<?php $inumber = array (
+					'name'=>'item_number',
+					'id'=>'item_number',
+					'value'=>$item_info->item_number,
+					'style'       => 'border:none',
+					'readonly' => 'readonly'
+				);
+				
+					echo form_input($inumber);
+				?>
+			</td>
+			</tr>
+			<tr>
+			<td>	
+				<?php echo form_label($this->lang->line('items_name').':', 'name',array('class'=>'wide')); ?>
+			</td>
+			<td>	
+				<?php $iname = array (
+					'name'=>'name',
+					'id'=>'name',
+					'value'=>$item_info->name,
+					'style'       => 'border:none',
+					'readonly' => 'readonly'
+				);
+					echo form_input($iname);
+					?>
+			</td>
+			</tr>
+			<tr>
+			<td>	
+				<?php echo form_label($this->lang->line('items_category').':', 'category',array('class'=>'wide')); ?>
+			</td>
+			<td>	
+				<?php $cat = array (
+					
+					'name'=>'category',
+					'id'=>'category',
+					'value'=>$item_info->category,
+					'style'       => 'border:none',
+					'readonly' => 'readonly'
+					);
+				
+					echo form_input($cat);
+					?>
+			</td>
+			</tr>
+			<tr>
+			<td>
+				<?php echo form_label($this->lang->line('items_stock_location').':', 'stock_location',array('class'=>'wide')); ?>
+			</td>
+			<td>
+				<?php 
+					echo form_dropdown('stock_location',$stock_locations,current($stock_locations),'onchange="display_stock(this.value)"');
+				?> 
+			</td>
+			</tr>
+			<tr>
+			<td>
+				<?php echo form_label($this->lang->line('items_current_quantity').':', 'quantity',array('class'=>'wide')); ?>
+			</td>
+			<td>
+				<?php $qty = array (
+				
+					'name'=>'quantity',
+					'id'=>'quantity',
+					'value'=>current($item_quantities),
+					'style'       => 'border:none',
+					'readonly' => 'readonly'
+					);
+				
+					echo form_input($qty);
+				?>
+			</td>
+			</tr>
+			</div>
+		</table>
 
-<div class="field_row clearfix">
-  <div class='form_field'></div>
-</div>
+		<div class="field_row clearfix">
+		  <div class='form_field'></div>
+		</div>
+
+		<div class="field_row clearfix">
+		  <div class='form_field'></div>
+		</div>
+	</fieldset>
+<?php echo form_close(); ?>
 
-<div class="field_row clearfix">
-  <div class='form_field'></div>
-</div>
-</fieldset>
-<?php 
-echo form_close();
-?>
 <?php
 $inventory_array = $this->Inventory->get_inventory_data_for_item($item_info->item_id)->result_array();
 $employee_name = array();
diff --git a/application/views/items/excel_import.php b/application/views/items/excel_import.php
index da2f38d3e..b4fd01b86 100644
--- a/application/views/items/excel_import.php
+++ b/application/views/items/excel_import.php
@@ -1,37 +1,33 @@
-<?php
-echo form_open_multipart('items/do_excel_import/',array('id'=>'item_form'));
-?>
-<div id="required_fields_message"><?php echo $this->lang->line('items_import_items_excel'); ?></div>
-<ul id="error_message_box" class="error_message_box"></ul>
-<b><a href="<?php echo site_url('items/excel'); ?>"><?php echo $this->lang->line('common_download_import_template'); ?></a></b>
-<fieldset id="item_basic_info">
-<legend><?php echo $this->lang->line('common_import'); ?></legend>
+<?php echo form_open_multipart('items/do_excel_import/',array('id'=>'item_form')); ?>
+	<div id="required_fields_message"><?php echo $this->lang->line('items_import_items_excel'); ?></div>
+	<ul id="error_message_box" class="error_message_box"></ul>
+	<b><a href="<?php echo site_url('items/excel'); ?>"><?php echo $this->lang->line('common_download_import_template'); ?></a></b>
+	<fieldset id="item_basic_info">
+		<legend><?php echo $this->lang->line('common_import'); ?></legend>
 
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('common_import_file_path').':', 'name',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_upload(array(
-		'name'=>'file_path',
-		'id'=>'file_path',
-		'value'=>'')
-	);?>
-	</div>
-</div>
+		<div class="field_row clearfix">	
+		<?php echo form_label($this->lang->line('common_import_file_path').':', 'name',array('class'=>'wide')); ?>
+			<div class='form_field'>
+			<?php echo form_upload(array(
+				'name'=>'file_path',
+				'id'=>'file_path',
+				'value'=>'')
+			);?>
+			</div>
+		</div>
+
+		<?php
+		echo form_submit(array(
+			'name'=>'submitf',
+			'id'=>'submitf',
+			'value'=>$this->lang->line('common_submit'),
+			'class'=>'btn btn-primary btn-sm pull-right')
+		);
+		?>
+	</fieldset>
+<?php echo form_close(); ?>
 
-<?php
-echo form_submit(array(
-	'name'=>'submitf',
-	'id'=>'submitf',
-	'value'=>$this->lang->line('common_submit'),
-	'class'=>'btn btn-primary btn-sm pull-right')
-);
-?>
-</fieldset>
-<?php 
-echo form_close();
-?>
 <script type='text/javascript'>
-
 //validation and submit handling
 $(document).ready(function()
 {	
diff --git a/application/views/items/form.php b/application/views/items/form.php
index 18d59c5c6..ddf011cbd 100644
--- a/application/views/items/form.php
+++ b/application/views/items/form.php
@@ -1,265 +1,261 @@
 <div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
 <ul id="error_message_box" class="error_message_box"></ul>
-<?php
-echo form_open('items/save/'.$item_info->item_id,array('id'=>'item_form', 'enctype'=>'multipart/form-data'));
-?>
-<fieldset id="item_basic_info">
-	<legend><?php echo $this->lang->line("items_basic_information"); ?></legend>
 
-	<div class="field_row clearfix">
-<?php echo form_label($this->lang->line('items_item_number').':', 'item_number',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'item_number',
-		'class'=>'item_number',
-		'id'=>'item_number',
-		'value'=>$item_info->item_number)
-	);?>
-	</div>
-	</div>
+<?php echo form_open('items/save/'.$item_info->item_id,array('id'=>'item_form', 'enctype'=>'multipart/form-data')); ?>
+	<fieldset id="item_basic_info">
+		<legend><?php echo $this->lang->line("items_basic_information"); ?></legend>
 
-	<div class="field_row clearfix">
-<?php echo form_label($this->lang->line('items_name').':', 'name',array('class'=>'required wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'name',
-		'id'=>'name',
-		'value'=>$item_info->name)
-	);?>
-	</div>
-</div>
-
-<div class="field_row clearfix">
-<?php echo form_label($this->lang->line('items_category').':', 'category',array('class'=>'required wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'category',
-		'id'=>'category',
-		'value'=>$item_info->category)
-	);?>
-	</div>
-</div>
-
-<div class="field_row clearfix">
-<?php echo form_label($this->lang->line('items_supplier').':', 'supplier',array('class'=>'required wide')); ?>
-	<div class='form_field'>
-	<?php echo form_dropdown('supplier_id', $suppliers, $selected_supplier);?>
-	</div>
-</div>
-
-<div class="field_row clearfix">
-<?php echo form_label($this->lang->line('items_cost_price').':', 'cost_price',array('class'=>'required wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'cost_price',
-		'size'=>'8',
-		'id'=>'cost_price',
-		'value'=>$item_info->cost_price)
-	);?>
-	</div>
-</div>
-
-<div class="field_row clearfix">
-<?php echo form_label($this->lang->line('items_unit_price').':', 'unit_price',array('class'=>'required wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'unit_price',
-		'size'=>'8',
-		'id'=>'unit_price',
-		'value'=>$item_info->unit_price)
-	);?>
-	</div>
-</div>
-
-<div class="field_row clearfix">
-<?php echo form_label($this->lang->line('items_tax_1').':', 'tax_percent_1',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'tax_names[]',
-		'id'=>'tax_name_1',
-		'size'=>'8',
-		'value'=> isset($item_tax_info[0]['name']) ? $item_tax_info[0]['name'] : $this->config->item('default_tax_1_name'))
-	);?>
-	</div>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'tax_percents[]',
-		'id'=>'tax_percent_name_1',
-		'size'=>'3',
-		'value'=> isset($item_tax_info[0]['percent']) ? $item_tax_info[0]['percent'] : $default_tax_1_rate)
-	);?>
-	%
-	</div>
-</div>
-
-<div class="field_row clearfix">
-<?php echo form_label($this->lang->line('items_tax_2').':', 'tax_percent_2',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'tax_names[]',
-		'id'=>'tax_name_2',
-		'size'=>'8',
-		'value'=> isset($item_tax_info[1]['name']) ? $item_tax_info[1]['name'] : $this->config->item('default_tax_2_name'))
-	);?>
-	</div>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'tax_percents[]',
-		'id'=>'tax_percent_name_2',
-		'size'=>'3',
-		'value'=> isset($item_tax_info[1]['percent']) ? $item_tax_info[1]['percent'] : $default_tax_2_rate)
-	);?>
-	%
-	</div>
-</div>
-
-<?php
-foreach($stock_locations as $key=>$location_detail)
-{
-?>
-    <div class="field_row clearfix">
-    <?php echo form_label($this->lang->line('items_quantity').' '.$location_detail['location_name'] .':', 
-                            $key.'_quantity',
-                            array('class'=>'required wide')); ?>
-    	<div class='form_field'>
-    	<?php echo form_input(array(
-    		'name'=>$key.'_quantity',
-    		'id'=>$key.'_quantity',
-    		'class'=>'quantity',
-    		'size'=>'8',
-    		'value'=>isset($item_info->item_id)?$location_detail['quantity']:0)
-    	);?>
-    	</div>
-	</div>
-<?php
-}
-?>
-
-<div class="field_row clearfix">
-<?php echo form_label($this->lang->line('items_receiving_quantity').':', 'receiving_quantity',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'receiving_quantity',
-		'id'=>'receiving_quantity',
-		'size'=>'8',
-		'value'=>$item_info->receiving_quantity)
-	);?>
-	</div>
-	</div>
-
-	<div class="field_row clearfix">
-<?php echo form_label($this->lang->line('items_reorder_level').':', 'reorder_level',array('class'=>'required wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'reorder_level',
-		'id'=>'reorder_level',
-		'size'=>'8',
-		'value'=>!isset($item_info->item_id)?0:$item_info->reorder_level)
-	);?>
-	</div>
-	</div>
-
-	<div class="field_row clearfix">
-<?php echo form_label($this->lang->line('items_description').':', 'description',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_textarea(array(
-		'name'=>'description',
-		'id'=>'description',
-		'value'=>$item_info->description,
-		'rows'=>'5',
-		'cols'=>'17')
-	);?>
-	</div>
-</div>
-
-<div class="field_row clearfix">
-<?php echo form_label($this->lang->line('items_image').':', 'item_image',array('class'=>'wide')); ?>
-    <div class='form_field'>
-        <?php echo form_upload('item_image');?>
-    </div>
-</div>
-
-<div class="field_row clearfix">
-<?php echo form_label($this->lang->line('items_allow_alt_description').':', 'allow_alt_description',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_checkbox(array(
-		'name'=>'allow_alt_description',
-		'id'=>'allow_alt_description',
-		'value'=>1,
-		'checked'=>($item_info->allow_alt_description)? 1  :0)
-	);?>
-	</div>
-</div>
-
-<div class="field_row clearfix">
-<?php echo form_label($this->lang->line('items_is_serialized').':', 'is_serialized',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_checkbox(array(
-		'name'=>'is_serialized',
-		'id'=>'is_serialized',
-		'value'=>1,
-		'checked'=>($item_info->is_serialized)? 1 : 0)
-	);?>
-	</div>
-</div>
-
-<div class="field_row clearfix">
-<?php echo form_label($this->lang->line('items_is_deleted').':', 'is_deleted',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_checkbox(array(
-		'name'=>'is_deleted',
-		'id'=>'is_deleted',
-		'value'=>1,
-		'checked'=>($item_info->deleted)? 1 : 0)
-	);?>
-	</div>
-</div>
-
-<?php for ($i = 0; $i < 11; $i++) 
-{ 
-?>
-	<?php
-	if($this->config->item('custom'.$i.'_name') != null)
-	{
-		$item_arr = (array)$item_info;
-		?>
 		<div class="field_row clearfix">
-			<?php 	
-			echo form_label($this->config->item('custom'.$i.'_name').':', 'custom'.$i,array('class'=>'wide')); ?>
+		<?php echo form_label($this->lang->line('items_item_number').':', 'item_number',array('class'=>'wide')); ?>
+		<div class='form_field'>
+		<?php echo form_input(array(
+			'name'=>'item_number',
+			'class'=>'item_number',
+			'id'=>'item_number',
+			'value'=>$item_info->item_number)
+		);?>
+		</div>
+		</div>
+
+		<div class="field_row clearfix">
+		<?php echo form_label($this->lang->line('items_name').':', 'name',array('class'=>'required wide')); ?>
+		<div class='form_field'>
+			<?php echo form_input(array(
+				'name'=>'name',
+				'id'=>'name',
+				'value'=>$item_info->name)
+			);?>
+		</div>
+	</div>
+
+	<div class="field_row clearfix">
+		<?php echo form_label($this->lang->line('items_category').':', 'category',array('class'=>'required wide')); ?>
+		<div class='form_field'>
+			<?php echo form_input(array(
+				'name'=>'category',
+				'id'=>'category',
+				'value'=>$item_info->category)
+			);?>
+		</div>
+	</div>
+
+	<div class="field_row clearfix">
+		<?php echo form_label($this->lang->line('items_supplier').':', 'supplier',array('class'=>'required wide')); ?>
+		<div class='form_field'>
+			<?php echo form_dropdown('supplier_id', $suppliers, $selected_supplier);?>
+		</div>
+	</div>
+
+	<div class="field_row clearfix">
+		<?php echo form_label($this->lang->line('items_cost_price').':', 'cost_price',array('class'=>'required wide')); ?>
+		<div class='form_field'>
+			<?php echo form_input(array(
+				'name'=>'cost_price',
+				'size'=>'8',
+				'id'=>'cost_price',
+				'value'=>$item_info->cost_price)
+			);?>
+		</div>
+	</div>
+
+	<div class="field_row clearfix">
+		<?php echo form_label($this->lang->line('items_unit_price').':', 'unit_price',array('class'=>'required wide')); ?>
+		<div class='form_field'>
+			<?php echo form_input(array(
+				'name'=>'unit_price',
+				'size'=>'8',
+				'id'=>'unit_price',
+				'value'=>$item_info->unit_price)
+			);?>
+		</div>
+	</div>
+
+	<div class="field_row clearfix">
+		<?php echo form_label($this->lang->line('items_tax_1').':', 'tax_percent_1',array('class'=>'wide')); ?>
+		<div class='form_field'>
+			<?php echo form_input(array(
+				'name'=>'tax_names[]',
+				'id'=>'tax_name_1',
+				'size'=>'8',
+				'value'=> isset($item_tax_info[0]['name']) ? $item_tax_info[0]['name'] : $this->config->item('default_tax_1_name'))
+			);?>
+		</div>
+		<div class='form_field'>
+			<?php echo form_input(array(
+				'name'=>'tax_percents[]',
+				'id'=>'tax_percent_name_1',
+				'size'=>'3',
+				'value'=> isset($item_tax_info[0]['percent']) ? $item_tax_info[0]['percent'] : $default_tax_1_rate)
+			);?>
+			%
+		</div>
+	</div>
+
+	<div class="field_row clearfix">
+	<?php echo form_label($this->lang->line('items_tax_2').':', 'tax_percent_2',array('class'=>'wide')); ?>
+		<div class='form_field'>
+			<?php echo form_input(array(
+				'name'=>'tax_names[]',
+				'id'=>'tax_name_2',
+				'size'=>'8',
+				'value'=> isset($item_tax_info[1]['name']) ? $item_tax_info[1]['name'] : $this->config->item('default_tax_2_name'))
+			);?>
+		</div>
+		<div class='form_field'>
+			<?php echo form_input(array(
+				'name'=>'tax_percents[]',
+				'id'=>'tax_percent_name_2',
+				'size'=>'3',
+				'value'=> isset($item_tax_info[1]['percent']) ? $item_tax_info[1]['percent'] : $default_tax_2_rate)
+			);?>
+			%
+		</div>
+	</div>
+
+	<?php
+	foreach($stock_locations as $key=>$location_detail)
+	{
+	?>
+		<div class="field_row clearfix">
+		<?php echo form_label($this->lang->line('items_quantity').' '.$location_detail['location_name'] .':', 
+								$key.'_quantity',
+								array('class'=>'required wide')); ?>
 			<div class='form_field'>
 				<?php echo form_input(array(
-					'name'=>'custom'.$i,
-					'id'=>'custom'.$i,
-					'value'=>$item_arr['custom'.$i])
+					'name'=>$key.'_quantity',
+					'id'=>$key.'_quantity',
+					'class'=>'quantity',
+					'size'=>'8',
+					'value'=>isset($item_info->item_id)?$location_detail['quantity']:0)
 				);?>
 			</div>
 		</div>
-		<?php 
+	<?php
 	}
-}
-?>
+	?>
+
+	<div class="field_row clearfix">
+		<?php echo form_label($this->lang->line('items_receiving_quantity').':', 'receiving_quantity',array('class'=>'wide')); ?>
+		<div class='form_field'>
+			<?php echo form_input(array(
+				'name'=>'receiving_quantity',
+				'id'=>'receiving_quantity',
+				'size'=>'8',
+				'value'=>$item_info->receiving_quantity)
+			);?>
+		</div>
+	</div>
+
+	<div class="field_row clearfix">
+		<?php echo form_label($this->lang->line('items_reorder_level').':', 'reorder_level',array('class'=>'required wide')); ?>
+		<div class='form_field'>
+			<?php echo form_input(array(
+				'name'=>'reorder_level',
+				'id'=>'reorder_level',
+				'size'=>'8',
+				'value'=>!isset($item_info->item_id)?0:$item_info->reorder_level)
+			);?>
+		</div>
+	</div>
+
+	<div class="field_row clearfix">
+		<?php echo form_label($this->lang->line('items_description').':', 'description',array('class'=>'wide')); ?>
+		<div class='form_field'>
+			<?php echo form_textarea(array(
+				'name'=>'description',
+				'id'=>'description',
+				'value'=>$item_info->description,
+				'rows'=>'5',
+				'cols'=>'17')
+			);?>
+		</div>
+	</div>
+
+	<div class="field_row clearfix">
+		<?php echo form_label($this->lang->line('items_image').':', 'item_image',array('class'=>'wide')); ?>
+		<div class='form_field'>
+			<?php echo form_upload('item_image');?>
+		</div>
+	</div>
+
+	<div class="field_row clearfix">
+		<?php echo form_label($this->lang->line('items_allow_alt_description').':', 'allow_alt_description',array('class'=>'wide')); ?>
+		<div class='form_field'>
+			<?php echo form_checkbox(array(
+				'name'=>'allow_alt_description',
+				'id'=>'allow_alt_description',
+				'value'=>1,
+				'checked'=>($item_info->allow_alt_description)? 1  :0)
+			);?>
+		</div>
+	</div>
+
+	<div class="field_row clearfix">
+		<?php echo form_label($this->lang->line('items_is_serialized').':', 'is_serialized',array('class'=>'wide')); ?>
+		<div class='form_field'>
+			<?php echo form_checkbox(array(
+				'name'=>'is_serialized',
+				'id'=>'is_serialized',
+				'value'=>1,
+				'checked'=>($item_info->is_serialized)? 1 : 0)
+			);?>
+		</div>
+	</div>
+
+	<div class="field_row clearfix">
+		<?php echo form_label($this->lang->line('items_is_deleted').':', 'is_deleted',array('class'=>'wide')); ?>
+		<div class='form_field'>
+			<?php echo form_checkbox(array(
+				'name'=>'is_deleted',
+				'id'=>'is_deleted',
+				'value'=>1,
+				'checked'=>($item_info->deleted)? 1 : 0)
+			);?>
+		</div>
+	</div>
+
+	<?php for ($i = 0; $i < 11; $i++) 
+	{ 
+	?>
+		<?php
+		if($this->config->item('custom'.$i.'_name') != null)
+		{
+			$item_arr = (array)$item_info;
+			?>
+			<div class="field_row clearfix">
+				<?php echo form_label($this->config->item('custom'.$i.'_name').':', 'custom'.$i,array('class'=>'wide')); ?>
+				<div class='form_field'>
+					<?php echo form_input(array(
+						'name'=>'custom'.$i,
+						'id'=>'custom'.$i,
+						'value'=>$item_arr['custom'.$i])
+					);?>
+				</div>
+			</div>
+			<?php 
+		}
+	}
+	?>
+
+	<?php
+	echo form_submit(array(
+		'name'=>'submit',
+		'id'=>'submit',
+		'value'=>$this->lang->line('common_submit'),
+		'class'=>'btn btn-primary btn-sm pull-right')
+	);
+	echo form_submit(array(
+		'name'=>'continue',
+		'id'=>'continue',
+		'value'=>$this->lang->line('common_new'),
+		'class'=>'btn btn-default btn-sm pull-right',
+		'style'=>'margin-right: 10px;')
+	);
+	?>
+	</fieldset>
+<?php echo form_close(); ?>
 
-<?php
-echo form_submit(array(
-	'name'=>'submit',
-	'id'=>'submit',
-	'value'=>$this->lang->line('common_submit'),
-	'class'=>'btn btn-primary btn-sm pull-right')
-);
-echo form_submit(array(
-	'name'=>'continue',
-	'id'=>'continue',
-	'value'=>$this->lang->line('common_new'),
-	'class'=>'btn btn-default btn-sm pull-right',
-	'style'=>'margin-right: 10px;')
-);
-?>
-</fieldset>
-<?php
-echo form_close();
-?>
 <script type='text/javascript'>
-
 //validation and submit handling
 $(document).ready(function()
 {
diff --git a/application/views/items/form_bulk.php b/application/views/items/form_bulk.php
index 4e2322699..44bb1acac 100644
--- a/application/views/items/form_bulk.php
+++ b/application/views/items/form_bulk.php
@@ -1,159 +1,151 @@
 <div id="required_fields_message"><?php echo $this->lang->line('items_edit_fields_you_want_to_update'); ?></div>
 <ul id="error_message_box" class="error_message_box"></ul>
-<?php
-echo form_open('items/bulk_update/',array('id'=>'item_form'));
-?>
-<fieldset id="item_basic_info">
-<legend><?php echo $this->lang->line("items_basic_information"); ?></legend>
 
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('items_name').':', 'name',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'name',
-		'id'=>'name')
-	);?>
-	</div>
-</div>
+<?php echo form_open('items/bulk_update/',array('id'=>'item_form')); ?>
+	<fieldset id="item_basic_info">
+		<legend><?php echo $this->lang->line("items_basic_information"); ?></legend>
 
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('items_category').':', 'category',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'category',
-		'id'=>'category')
-	);?>
-	</div>
-</div>
+		<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('items_name').':', 'name',array('class'=>'wide')); ?>
+			<div class='form_field'>
+				<?php echo form_input(array(
+					'name'=>'name',
+					'id'=>'name')
+				);?>
+			</div>
+		</div>
 
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('items_supplier').':', 'supplier',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_dropdown('supplier_id', $suppliers, '');?>
-	</div>
-</div>
+		<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('items_category').':', 'category',array('class'=>'wide')); ?>
+			<div class='form_field'>
+				<?php echo form_input(array(
+					'name'=>'category',
+					'id'=>'category')
+				);?>
+			</div>
+		</div>
 
+		<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('items_supplier').':', 'supplier',array('class'=>'wide')); ?>
+			<div class='form_field'>
+				<?php echo form_dropdown('supplier_id', $suppliers, '');?>
+			</div>
+		</div>
 
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('items_cost_price').':', 'cost_price',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'cost_price',
-		'size'=>'8',
-		'id'=>'cost_price')
-	);?>
-	</div>
-</div>
+		<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('items_cost_price').':', 'cost_price',array('class'=>'wide')); ?>
+			<div class='form_field'>
+				<?php echo form_input(array(
+					'name'=>'cost_price',
+					'size'=>'8',
+					'id'=>'cost_price')
+				);?>
+			</div>
+		</div>
 
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('items_unit_price').':', 'unit_price',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'unit_price',
-		'size'=>'8',
-		'id'=>'unit_price')
-	);?>
-	</div>
-</div>
+		<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('items_unit_price').':', 'unit_price',array('class'=>'wide')); ?>
+			<div class='form_field'>
+				<?php echo form_input(array(
+					'name'=>'unit_price',
+					'size'=>'8',
+					'id'=>'unit_price')
+				);?>
+			</div>
+		</div>
 
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('items_tax_1').':', 'tax_percent_1',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'tax_names[]',
-		'id'=>'tax_name_1',
-		'size'=>'8',
-		'value'=> isset($item_tax_info[0]['name']) ? $item_tax_info[0]['name'] : $this->lang->line('items_sales_tax_1'))
-	);?>
-	</div>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'tax_percents[]',
-		'id'=>'tax_percent_name_1',
-		'size'=>'3',
-		'value'=> isset($item_tax_info[0]['percent']) ? $item_tax_info[0]['percent'] : '')
-	);?>
-	%
-	</div>
-</div>
+		<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('items_tax_1').':', 'tax_percent_1',array('class'=>'wide')); ?>
+			<div class='form_field'>
+				<?php echo form_input(array(
+					'name'=>'tax_names[]',
+					'id'=>'tax_name_1',
+					'size'=>'8',
+					'value'=> isset($item_tax_info[0]['name']) ? $item_tax_info[0]['name'] : $this->lang->line('items_sales_tax_1'))
+				);?>
+			</div>
 
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('items_tax_2').':', 'tax_percent_2',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'tax_names[]',
-		'id'=>'tax_name_2',
-		'size'=>'8',
-		'value'=> isset($item_tax_info[1]['name']) ? $item_tax_info[1]['name'] : $this->lang->line('items_sales_tax_2'))
-	);?>
-	</div>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'tax_percents[]',
-		'id'=>'tax_percent_name_2',
-		'size'=>'3',
-		'value'=> isset($item_tax_info[1]['percent']) ? $item_tax_info[1]['percent'] : '')
-	);?>
-	%
-	</div>
-</div>
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('items_reorder_level').':', 'reorder_level',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'reorder_level',
-		'id'=>'reorder_level')
-	);?>
-	</div>
-</div>
+			<div class='form_field'>
+				<?php echo form_input(array(
+					'name'=>'tax_percents[]',
+					'id'=>'tax_percent_name_1',
+					'size'=>'3',
+					'value'=> isset($item_tax_info[0]['percent']) ? $item_tax_info[0]['percent'] : '')
+				);?>
+				%
+			</div>
+		</div>
 
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('items_description').':', 'description',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_textarea(array(
-		'name'=>'description',
-		'id'=>'description',
-		'rows'=>'5',
-		'cols'=>'17')		
-	);?>
-	</div>
-</div>
+		<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('items_tax_2').':', 'tax_percent_2',array('class'=>'wide')); ?>
+			<div class='form_field'>
+				<?php echo form_input(array(
+					'name'=>'tax_names[]',
+					'id'=>'tax_name_2',
+					'size'=>'8',
+					'value'=> isset($item_tax_info[1]['name']) ? $item_tax_info[1]['name'] : $this->lang->line('items_sales_tax_2'))
+				);?>
+			</div>
 
-<div class="field_row clearfix">
+			<div class='form_field'>
+				<?php echo form_input(array(
+					'name'=>'tax_percents[]',
+					'id'=>'tax_percent_name_2',
+					'size'=>'3',
+					'value'=> isset($item_tax_info[1]['percent']) ? $item_tax_info[1]['percent'] : '')
+				);?>
+				%
+			</div>
+		</div>
 
-<?php echo form_label($this->lang->line('items_allow_alt_description').':', 'allow_alt_description',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_dropdown('allow_alt_description', $allow_alt_description_choices);?>
-	</div>
+		<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('items_reorder_level').':', 'reorder_level',array('class'=>'wide')); ?>
+			<div class='form_field'>
+				<?php echo form_input(array(
+					'name'=>'reorder_level',
+					'id'=>'reorder_level')
+				);?>
+			</div>
+		</div>
 
-</div>
+		<div class="field_row clearfix">	
+			<?php echo form_label($this->lang->line('items_description').':', 'description',array('class'=>'wide')); ?>
+			<div class='form_field'>
+				<?php echo form_textarea(array(
+					'name'=>'description',
+					'id'=>'description',
+					'rows'=>'5',
+					'cols'=>'17')		
+				);?>
+			</div>
+		</div>
 
+		<div class="field_row clearfix">
+			<?php echo form_label($this->lang->line('items_allow_alt_description').':', 'allow_alt_description',array('class'=>'wide')); ?>
+			<div class='form_field'>
+				<?php echo form_dropdown('allow_alt_description', $allow_alt_description_choices);?>
+			</div>
+		</div>
 
+		<div class="field_row clearfix">
+			<?php echo form_label($this->lang->line('items_is_serialized').':', 'is_serialized',array('class'=>'wide')); ?>
+			<div class='form_field'>
+				<?php echo form_dropdown('is_serialized', $serialization_choices);?>
+			</div>
+		</div>
 
-<div class="field_row clearfix">
+		<?php
+		echo form_submit(array(
+			'name'=>'submit',
+			'id'=>'submit',
+			'value'=>$this->lang->line('common_submit'),
+			'class'=>'btn btn-primary btn-sm pull-right')
+		);
+		?>
+	</fieldset>
+<?php echo form_close(); ?>
 
-<?php echo form_label($this->lang->line('items_is_serialized').':', 'is_serialized',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_dropdown('is_serialized', $serialization_choices);?>
-
-	</div>
-
-</div>
-
-<?php
-echo form_submit(array(
-	'name'=>'submit',
-	'id'=>'submit',
-	'value'=>$this->lang->line('common_submit'),
-	'class'=>'btn btn-primary btn-sm pull-right')
-);
-?>
-</fieldset>
-<?php 
-echo form_close();
-?>
 <script type='text/javascript'>
-
 //validation and submit handling
 $(document).ready(function()
 {	
diff --git a/application/views/items/inventory.php b/application/views/items/inventory.php
index 49fff5fd8..1df33347b 100644
--- a/application/views/items/inventory.php
+++ b/application/views/items/inventory.php
@@ -1,130 +1,127 @@
 <div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
 <ul id="error_message_box" class="error_message_box"></ul>
-<?php
-echo form_close();
-echo form_open('items/save_inventory/'.$item_info->item_id,array('id'=>'item_form'));
-?>
-<fieldset id="item_basic_info">
-<legend><?php echo $this->lang->line("items_basic_information"); ?></legend>
 
-<table align="center" border="0" bgcolor="#CCCCCC">
-<div class="field_row clearfix">
-<tr>
-<td>	
-<?php echo form_label($this->lang->line('items_item_number').':', 'name',array('class'=>'wide')); ?>
-</td>
-<td>
-	<?php $inumber = array (
-		'name'=>'item_number',
-		'id'=>'item_number',
-		'value'=>$item_info->item_number,
-		'style'       => 'border:none',
-		'readonly' => 'readonly'
-	);
-	
-		echo form_input($inumber)
-	?>
-</td>
-</tr>
-<tr>
-<td>	
-<?php echo form_label($this->lang->line('items_name').':', 'name',array('class'=>'wide')); ?>
-</td>
-<td>	
-	<?php $iname = array (
-		'name'=>'name',
-		'id'=>'name',
-		'value'=>$item_info->name,
-		'style'       => 'border:none',
-		'readonly' => 'readonly'
-	);
-		echo form_input($iname);
-		?>
-</td>
-</tr>
-<tr>
-<td>	
-<?php echo form_label($this->lang->line('items_category').':', 'category',array('class'=>'wide')); ?>
-</td>
-<td>	
-	<?php $cat = array (
-		
-		'name'=>'category',
-		'id'=>'category',
-		'value'=>$item_info->category,
-		'style'       => 'border:none',
-		'readonly' => 'readonly'
+<?php echo form_open('items/save_inventory/'.$item_info->item_id,array('id'=>'item_form')); ?>
+	<fieldset id="item_basic_info">
+		<legend><?php echo $this->lang->line("items_basic_information"); ?></legend>
+
+		<table align="center" border="0" bgcolor="#CCCCCC">
+		<div class="field_row clearfix">
+		<tr>
+		<td>	
+		<?php echo form_label($this->lang->line('items_item_number').':', 'name',array('class'=>'wide')); ?>
+		</td>
+		<td>
+			<?php $inumber = array (
+				'name'=>'item_number',
+				'id'=>'item_number',
+				'value'=>$item_info->item_number,
+				'style'       => 'border:none',
+				'readonly' => 'readonly'
+			);
+			
+				echo form_input($inumber);
+			?>
+		</td>
+		</tr>
+		<tr>
+		<td>	
+		<?php echo form_label($this->lang->line('items_name').':', 'name',array('class'=>'wide')); ?>
+		</td>
+		<td>	
+			<?php $iname = array (
+				'name'=>'name',
+				'id'=>'name',
+				'value'=>$item_info->name,
+				'style'       => 'border:none',
+				'readonly' => 'readonly'
+			);
+				echo form_input($iname);
+				?>
+		</td>
+		</tr>
+		<tr>
+		<td>	
+		<?php echo form_label($this->lang->line('items_category').':', 'category',array('class'=>'wide')); ?>
+		</td>
+		<td>	
+			<?php $cat = array (
+				
+				'name'=>'category',
+				'id'=>'category',
+				'value'=>$item_info->category,
+				'style'       => 'border:none',
+				'readonly' => 'readonly'
+				);
+			
+				echo form_input($cat);
+				?>
+		</td>
+		</tr>
+		<tr>
+		<td>
+		<?php echo form_label($this->lang->line('items_stock_location').':', 'stock_location',array('class'=>'wide')); ?>
+		</td>
+		<td>
+			<?php 
+					echo form_dropdown('stock_location',$stock_locations,current($stock_locations),'onchange="fill_quantity(this.value)"'); 
+			?> 
+		</td>
+		</tr>
+		<tr>
+		<td>
+		<?php echo form_label($this->lang->line('items_current_quantity').':', 'quantity',array('class'=>'wide')); ?>
+		</td>
+		<td>
+			<?php $qty = array (
+			
+				'name'=>'quantity',
+				'id'=>'quantity',
+				'value'=>current($item_quantities),
+				'style'       => 'border:none',
+				'readonly' => 'readonly'
+				);
+			
+				echo form_input($qty);
+			?>
+		</td>
+		</tr>
+		</div>	
+		</table>
+
+		<div class="field_row clearfix">	
+		<?php echo form_label($this->lang->line('items_add_minus').':', 'quantity',array('class'=>'required wide')); ?>
+			<div class='form_field'>
+			<?php echo form_input(array(
+				'name'=>'newquantity',
+				'id'=>'newquantity'
+				)
+			);?>
+			</div>
+		</div>
+
+		<div class="field_row clearfix">	
+		<?php echo form_label($this->lang->line('items_inventory_comments').':', 'description',array('class'=>'wide')); ?>
+			<div class='form_field'>
+			<?php echo form_textarea(array(
+				'name'=>'trans_comment',
+				'id'=>'trans_comment',
+				'rows'=>'3',
+				'cols'=>'17')		
+			);?>
+			</div>
+		</div>
+		<?php
+		echo form_submit(array(
+			'name'=>'submit',
+			'id'=>'submit',
+			'value'=>$this->lang->line('common_submit'),
+			'class'=>'btn btn-primary btn-sm pull-right')
 		);
-	
-		echo form_input($cat);
 		?>
-</td>
-</tr>
-<tr>
-<td>
-<?php echo form_label($this->lang->line('items_stock_location').':', 'stock_location',array('class'=>'wide')); ?>
-</td>
-<td>
-    <?php 
-            echo form_dropdown('stock_location',$stock_locations,current($stock_locations),'onchange="fill_quantity(this.value)"'); 
-    ?> 
-</td>
-</tr>
-<tr>
-<td>
-<?php echo form_label($this->lang->line('items_current_quantity').':', 'quantity',array('class'=>'wide')); ?>
-</td>
-<td>
-	<?php $qty = array (
-	
-		'name'=>'quantity',
-		'id'=>'quantity',
-		'value'=>current($item_quantities),
-		'style'       => 'border:none',
-		'readonly' => 'readonly'
-		);
-	
-		echo form_input($qty);
-	?>
-</td>
-</tr>
-</div>	
-</table>
+	</fieldset>
+<?php echo form_close(); ?>
 
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('items_add_minus').':', 'quantity',array('class'=>'required wide')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'newquantity',
-		'id'=>'newquantity'
-		)
-	);?>
-	</div>
-</div>
-
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('items_inventory_comments').':', 'description',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_textarea(array(
-		'name'=>'trans_comment',
-		'id'=>'trans_comment',
-		'rows'=>'3',
-		'cols'=>'17')		
-	);?>
-	</div>
-</div>
-<?php
-echo form_submit(array(
-	'name'=>'submit',
-	'id'=>'submit',
-	'value'=>$this->lang->line('common_submit'),
-	'class'=>'btn btn-primary btn-sm pull-right')
-);
-?>
-</fieldset>
-<?php 
-echo form_close();
-?>
 <script type='text/javascript'>
 
 //validation and submit handling
diff --git a/application/views/items/manage.php b/application/views/items/manage.php
index 4151bee0b..14f91f5fb 100644
--- a/application/views/items/manage.php
+++ b/application/views/items/manage.php
@@ -89,7 +89,7 @@ function post_item_form_submit(response)
 {
     if(!response.success)
     {
-        set_feedback(response.message,'error_message',true);
+        set_feedback(response.message, 'alert alert-dismissible alert-danger', true);
     }
     else
     {
@@ -97,7 +97,7 @@ function post_item_form_submit(response)
         if(jQuery.inArray(response.item_id,get_visible_checkbox_ids()) != -1)
         {
             update_row(response.item_id,'<?php echo site_url("$controller_name/get_row")?>',resize_thumbs);
-            set_feedback(response.message,'success_message',false);
+            set_feedback(response.message, 'alert alert-dismissible alert-success', false);
         }
         else //refresh entire table
         {
@@ -105,7 +105,7 @@ function post_item_form_submit(response)
             {
                 //highlight new row
                 hightlight_row(response.item_id);
-                set_feedback(response.message,'success_message',false);
+                set_feedback(response.message, 'alert alert-dismissible alert-success', false);
             });
         }
     }
@@ -115,7 +115,7 @@ function post_bulk_form_submit(response)
 {
     if(!response.success)
     {
-        set_feedback(response.message,'error_message',true);
+        set_feedback(response.message, 'alert alert-dismissible alert-danger', true);
     }
     else
     {
@@ -124,7 +124,7 @@ function post_bulk_form_submit(response)
         {
             update_row(selected_item_ids[k],'<?php echo site_url("$controller_name/get_row")?>',resize_thumbs);
         }
-        set_feedback(response.message,'success_message',false);
+        set_feedback(response.message, 'alert alert-dismissible alert-success', false);
     }
 }
 
@@ -162,56 +162,56 @@ function show_hide_search_filter(search_filter_section, switchImgTag)
 </div>
 
 <div id="pagination"><?= $links ?></div>
+
 <div id="titleTextImg" style="background-color:#EEEEEE;height:30px;position:relative;">
     <div style="float:left;vertical-align:text-top;"><?php echo $this->lang->line('common_search_options'); ?> :</div>
     <a id="imageDivLink" href="javascript:show_hide_search_filter('search_filter_section', 'imageDivLink');" style="outline:none;">
     <img src="
     <?php echo isset($search_section_state)? ( ($search_section_state)? base_url().'images/minus.png' : base_url().'images/plus.png') : 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')); ?>
-<div id="search_filter_section" style="display: <?php echo isset($search_section_state)?  ( ($search_section_state)? 'block' : 'none') : 'none';?>; background-color:#EEEEEE;">
-    <?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));?> 
+	<div id="search_filter_section" style="display: <?php echo isset($search_section_state)?  ( ($search_section_state)? 'block' : 'none') : 'none';?>; background-color:#EEEEEE;">
+		<?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'));?>
-    
-    <input type="hidden" name="search_section_state" id="search_section_state" value="<?php echo isset($search_section_state)?  ( ($search_section_state)? 'block' : 'none') : 'none';?>" />
-</div>
-<div id="table_action_header">
-    <ul>
-        <li class="float_left"><span><?php echo anchor("$controller_name/delete",$this->lang->line("common_delete"),array('id'=>'delete')); ?></span></li>
-        <li class="float_left"><span><?php echo anchor("$controller_name/bulk_edit/width:$form_width",$this->lang->line("items_bulk_edit"),array('id'=>'bulk_edit','title'=>$this->lang->line('items_edit_multiple_items'))); ?></span></li>
-        <li class="float_left"><span><?php echo anchor("$controller_name/generate_barcodes",$this->lang->line("items_generate_barcodes"),array('id'=>'generate_barcodes', 'target' =>'_blank','title'=>$this->lang->line('items_generate_barcodes'))); ?></span></li>
-        <?php if (count($stock_locations) > 1): ?>
-            <li class="float_left"><span><?php echo form_dropdown('stock_location',$stock_locations,$stock_location,'id="stock_location" onchange="$(\'#search_form\').submit();"'); ?></span></li>
-        <?php endif; ?>
-        <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'/>
-            <input type="hidden" name ='limit_from' id='limit_from'/>
-        </li>
-    </ul>
-</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'));?>
+		
+		<input type="hidden" name="search_section_state" id="search_section_state" value="<?php echo isset($search_section_state)?  ( ($search_section_state)? 'block' : 'none') : 'none';?>" />
+	</div>
 
+	<div id="table_action_header">
+		<ul>
+			<li class="float_left"><span><?php echo anchor("$controller_name/delete",$this->lang->line("common_delete"),array('id'=>'delete')); ?></span></li>
+			<li class="float_left"><span><?php echo anchor("$controller_name/bulk_edit/width:$form_width",$this->lang->line("items_bulk_edit"),array('id'=>'bulk_edit','title'=>$this->lang->line('items_edit_multiple_items'))); ?></span></li>
+			<li class="float_left"><span><?php echo anchor("$controller_name/generate_barcodes",$this->lang->line("items_generate_barcodes"),array('id'=>'generate_barcodes', 'target' =>'_blank','title'=>$this->lang->line('items_generate_barcodes'))); ?></span></li>
+			<?php if (count($stock_locations) > 1): ?>
+				<li class="float_left"><span><?php echo form_dropdown('stock_location',$stock_locations,$stock_location,'id="stock_location" onchange="$(\'#search_form\').submit();"'); ?></span></li>
+			<?php endif; ?>
+			<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'/>
+				<input type="hidden" name ='limit_from' id='limit_from'/>
+			</li>
+		</ul>
+	</div>
 <?php echo form_close(); ?>
 
 <div id="table_holder">
     <?php echo $manage_table; ?>
 </div>
 
-<div id="feedback_bar"></div>
-
 <?php $this->load->view("partial/footer"); ?>
diff --git a/application/views/partial/footer.php b/application/views/partial/footer.php
index 9472f79e1..b2cdfd0d5 100644
--- a/application/views/partial/footer.php
+++ b/application/views/partial/footer.php
@@ -1,3 +1,4 @@
+			<div id="feedback_bar"></div>
 		</div>
 	</div>
 
diff --git a/application/views/partial/header.php b/application/views/partial/header.php
index 0717f13dd..695b12331 100644
--- a/application/views/partial/header.php
+++ b/application/views/partial/header.php
@@ -37,7 +37,7 @@
 		<!-- end js template tags -->
 	<?php else : ?>
 		<!-- start minjs template tags -->
-		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=a8ae30ad50" language="javascript"></script>
+		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=a96d6ab060" language="javascript"></script>
 		<!-- end minjs template tags -->       
 	<?php endif; ?>
 
@@ -69,47 +69,47 @@
 
 <body>
 	<div class="wrapper">
+		<div class="topbar">
+			<div class="container">
+				<div class="navbar-left">
+					<div id="liveclock"><?php echo date($this->config->item('dateformat').' '.$this->config->item('timeformat')) ?></div>
+				</div>
 
-	<div class="topbar">
-		<div class="container">
-			<div class="navbar-left">
-				<div id="liveclock"><?php echo date($this->config->item('dateformat').' '.$this->config->item('timeformat')) ?></div>
-			</div>
-			<div class="navbar-right" style="margin:0">
-				<?php echo $this->lang->line('common_welcome')." $user_info->first_name $user_info->last_name! | "; ?>
-				<?php echo anchor("home/logout", $this->lang->line("common_logout")); ?>
+				<div class="navbar-right" style="margin:0">
+					<?php echo $this->lang->line('common_welcome')." $user_info->first_name $user_info->last_name! | "; ?>
+					<?php echo anchor("home/logout", $this->lang->line("common_logout")); ?>
+				</div>
 			</div>
 		</div>
-	</div>
 
-	<div class="navbar navbar-default" role="navigation">
-		<div class="container">
-			<div class="navbar-header">
-				<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
-					<span class="sr-only">Toggle navigation</span>
-					<span class="icon-bar"></span>
-					<span class="icon-bar"></span>
-					<span class="icon-bar"></span>
-				</button>
-		
-				<a class="navbar-brand hidden-sm" href="<?php echo site_url(); ?>">OSPOS</a>
+		<div class="navbar navbar-default" role="navigation">
+			<div class="container">
+				<div class="navbar-header">
+					<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
+						<span class="sr-only">Toggle navigation</span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</button>
+			
+					<a class="navbar-brand hidden-sm" href="<?php echo site_url(); ?>">OSPOS</a>
+				</div>
+
+				<div class="navbar-collapse collapse">
+					<ul class="nav navbar-nav navbar-right">
+						<?php foreach($allowed_modules->result() as $module): ?>
+						<li class="<?php echo $module->module_id == $this->uri->segment(1)? 'active': ''; ?>">
+							<a href="<?php echo site_url("$module->module_id");?>" title="<?php echo $this->lang->line("module_".$module->module_id) ?>" class="menu-icon">
+								<img src="<?php echo base_url().'images/menubar/'.$module->module_id.'.png';?>" border="0" alt="Module Icon" /><br />
+								<?php echo $this->lang->line("module_".$module->module_id) ?>
+							</a>
+						</li>
+						<?php endforeach; ?>
+					</ul>
+				</div><!--/.nav-collapse -->
 			</div>
-
-			<div class="navbar-collapse collapse">
-				<ul class="nav navbar-nav navbar-right">
-					<?php foreach($allowed_modules->result() as $module): ?>
-					<li class="<?php echo $module->module_id == $this->uri->segment(1)? 'active': ''; ?>">
-						<a href="<?php echo site_url("$module->module_id");?>" title="<?php echo $this->lang->line("module_".$module->module_id) ?>" class="menu-icon">
-							<img src="<?php echo base_url().'images/menubar/'.$module->module_id.'.png';?>" border="0" alt="Module Icon" /><br />
-							<?php echo $this->lang->line("module_".$module->module_id) ?>
-						</a>
-					</li>
-					<?php endforeach; ?>
-				</ul>
-			</div><!--/.nav-collapse -->
 		</div>
-	</div>
 
-	<div class="container" id="main_container">
-		<div class="row">
- 
\ No newline at end of file
+		<div class="container">
+			<div class="row">
+	 
\ No newline at end of file
diff --git a/application/views/partial/header_excel.php b/application/views/partial/header_excel.php
index c60a36c20..881a7637e 100644
--- a/application/views/partial/header_excel.php
+++ b/application/views/partial/header_excel.php
@@ -18,17 +18,7 @@
 	{
 		display:none;
 	}
-	
-	#content_area
-	{
-		width:100%;
-	}
-	
-	#content_area_wrapper
-	{
-		border:0px;
-	}
-	
+
 	#sale_return_policy
 	{
 		width:100%;
diff --git a/application/views/people/manage.php b/application/views/people/manage.php
index 2ea596a2f..8a43d5105 100644
--- a/application/views/people/manage.php
+++ b/application/views/people/manage.php
@@ -33,7 +33,7 @@ function post_person_form_submit(response)
 {
 	if(!response.success)
 	{
-		set_feedback(response.message,'error_message',true);	
+		set_feedback(response.message, 'alert alert-dismissible alert-danger', true);	
 	}
 	else
 	{
@@ -41,7 +41,7 @@ function post_person_form_submit(response)
 		if(jQuery.inArray(response.person_id,get_visible_checkbox_ids()) != -1)
 		{
 			update_row(response.person_id,'<?php echo site_url("$controller_name/get_row")?>');
-			set_feedback(response.message,'success_message',false);	
+			set_feedback(response.message, 'alert alert-dismissible alert-success', false);	
 			
 		}
 		else //refresh entire table
@@ -50,7 +50,7 @@ function post_person_form_submit(response)
 			{
 				//highlight new row
 				hightlight_row(response.person_id);
-				set_feedback(response.message,'success_message',false);		
+				set_feedback(response.message, 'alert alert-dismissible alert-success', false);		
 			});
 		}
 	}
@@ -59,33 +59,41 @@ function post_person_form_submit(response)
 
 <div id="title_bar">
 	<div id="title" class="float_left"><?php echo $this->lang->line('common_list_of').' '.$this->lang->line('module_'.$controller_name); ?></div>
-	<?php if ($controller_name =='customers') {?>
+	<?php if ($controller_name =='customers')
+	{
+	?>
 		<?php echo anchor("$controller_name/excel_import/width:$form_width",
 		"<div class='btn btn-info btn-sm pull-right''><span>" . $this->lang->line('common_import_excel') . "</span></div>",
 			array('class'=>'thickbox none', 'title'=>'Import Items from Excel'));
 		?>	
-	<?php } ?>
+	<?php
+	}
+	?>
+
 	<?php echo anchor("$controller_name/view/-1/width:$form_width",
 	"<div class='btn btn-info btn-sm pull-right' style='margin-right: 10px;'><span>" . $this->lang->line($controller_name . '_new') . "</span></div>",
 	array('class'=>'thickbox none', 'title'=>$this->lang->line($controller_name . '_new')));
 	?>
 </div>
+
 <div id="pagination"><?= $links ?></div>
+
 <div id="table_action_header">
 	<ul>
 		<li class="float_left"><span><?php echo anchor("$controller_name/delete",$this->lang->line("common_delete"),array('id'=>'delete')); ?></span></li>
 		<li class="float_left"><span><a href="#" id="email"><?php echo $this->lang->line("common_email");?></a></span></li>
 		<li class="float_right">
-		<img src='<?php echo base_url()?>images/spinner_small.gif' alt='spinner' id='spinner' />
-		<?php echo form_open("$controller_name/search",array('id'=>'search_form')); ?>
-		<input type="text" name ='search' id='search'/>
-		<input type="hidden" name ='limit_from' id='limit_from'/>
-		</form>
+			<img src='<?php echo base_url()?>images/spinner_small.gif' alt='spinner' id='spinner' />
+			<?php echo form_open("$controller_name/search",array('id'=>'search_form')); ?>
+				<input type="text" name ='search' id='search'/>
+				<input type="hidden" name ='limit_from' id='limit_from'/>
+			<?php echo form_close(); ?>
 		</li>
 	</ul>
 </div>
+
 <div id="table_holder">
-<?php echo $manage_table; ?>
+	<?php echo $manage_table; ?>
 </div>
-<div id="feedback_bar"></div>
+
 <?php $this->load->view("partial/footer"); ?>
diff --git a/application/views/receivings/form.php b/application/views/receivings/form.php
index 70afe9127..bc4e11118 100755
--- a/application/views/receivings/form.php
+++ b/application/views/receivings/form.php
@@ -4,57 +4,57 @@
 	
 	<fieldset id="receiving_basic_info">
 		<?php echo form_open("receivings/save/".$receiving_info['receiving_id'],array('id'=>'recvs_edit_form')); ?>
-		<legend><?php echo $this->lang->line("recvs_basic_information"); ?></legend>
-		
-		<div class="field_row clearfix">
-			<?php echo form_label($this->lang->line('recvs_receipt_number').':', 'supplier'); ?>
-			<div class='form_field'>
-				<?php echo anchor('receivings/receipt/'.$receiving_info['receiving_id'], $this->lang->line('recvs_receipt_number') .$receiving_info['receiving_id'], array('target' => '_blank'));?>
+			<legend><?php echo $this->lang->line("recvs_basic_information"); ?></legend>
+			
+			<div class="field_row clearfix">
+				<?php echo form_label($this->lang->line('recvs_receipt_number').':', 'supplier'); ?>
+				<div class='form_field'>
+					<?php echo anchor('receivings/receipt/'.$receiving_info['receiving_id'], $this->lang->line('recvs_receipt_number') .$receiving_info['receiving_id'], array('target' => '_blank'));?>
+				</div>
 			</div>
-		</div>
-		
-		<div class="field_row clearfix">
-			<?php echo form_label($this->lang->line('recvs_date').':', 'date'); ?>
-			<div class='form_field'>
-				<?php echo form_input(array('name'=>'date','value'=>date($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), strtotime($receiving_info['receiving_time'])), 'id'=>'datetime', 'readonly'=>'true'));?>
+			
+			<div class="field_row clearfix">
+				<?php echo form_label($this->lang->line('recvs_date').':', 'date'); ?>
+				<div class='form_field'>
+					<?php echo form_input(array('name'=>'date','value'=>date($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), strtotime($receiving_info['receiving_time'])), 'id'=>'datetime', 'readonly'=>'true'));?>
+				</div>
 			</div>
-		</div>
-		
-		<div class="field_row clearfix">
-			<?php echo form_label($this->lang->line('recvs_supplier').':', 'supplier'); ?>
-			<div class='form_field'>
-				<?php echo form_input(array('name' => 'supplier_id', 'value' => $selected_supplier, 'id' => 'supplier_id'));?>
+			
+			<div class="field_row clearfix">
+				<?php echo form_label($this->lang->line('recvs_supplier').':', 'supplier'); ?>
+				<div class='form_field'>
+					<?php echo form_input(array('name' => 'supplier_id', 'value' => $selected_supplier, 'id' => 'supplier_id'));?>
+				</div>
 			</div>
-		</div>
-		
-		<div class="field_row clearfix">
-			<?php echo form_label($this->lang->line('recvs_invoice_number').':', 'invoice_number'); ?>
-			<div class='form_field'>
-				<?php echo form_input(array('name' => 'invoice_number', 'value' => $receiving_info['invoice_number'], 'id' => 'invoice_number'));?>
+			
+			<div class="field_row clearfix">
+				<?php echo form_label($this->lang->line('recvs_invoice_number').':', 'invoice_number'); ?>
+				<div class='form_field'>
+					<?php echo form_input(array('name' => 'invoice_number', 'value' => $receiving_info['invoice_number'], 'id' => 'invoice_number'));?>
+				</div>
 			</div>
-		</div>
-		
-		<div class="field_row clearfix">
-			<?php echo form_label($this->lang->line('recvs_employee').':', 'employee'); ?>
-			<div class='form_field'>
-				<?php echo form_dropdown('employee_id', $employees, $receiving_info['employee_id'], 'id="employee_id"');?>
+			
+			<div class="field_row clearfix">
+				<?php echo form_label($this->lang->line('recvs_employee').':', 'employee'); ?>
+				<div class='form_field'>
+					<?php echo form_dropdown('employee_id', $employees, $receiving_info['employee_id'], 'id="employee_id"');?>
+				</div>
 			</div>
-		</div>
-		
-		<div class="field_row clearfix">
-			<?php echo form_label($this->lang->line('recvs_comments').':', 'comment'); ?>
-			<div class='form_field'>
-				<?php echo form_textarea(array('name'=>'comment','value'=>$receiving_info['comment'],'rows'=>'4','cols'=>'23', 'id'=>'comment'));?>
+			
+			<div class="field_row clearfix">
+				<?php echo form_label($this->lang->line('recvs_comments').':', 'comment'); ?>
+				<div class='form_field'>
+					<?php echo form_textarea(array('name'=>'comment','value'=>$receiving_info['comment'],'rows'=>'4','cols'=>'23', 'id'=>'comment'));?>
+				</div>
 			</div>
-		</div>
-		
-		<?php echo form_submit(array(
-			'name'=>'submit',
-			'value'=>$this->lang->line('common_submit'),
-			'class'=> 'btn btn-primary btn-sm pull-right')
-		);
-		?>
-		</form>
+			
+			<?php echo form_submit(array(
+				'name'=>'submit',
+				'value'=>$this->lang->line('common_submit'),
+				'class'=> 'btn btn-primary btn-sm pull-right')
+			);
+			?>
+		<?php echo form_close(); ?>
 		
 		<?php echo form_open("receivings/delete/".$receiving_info['receiving_id'],array('id'=>'recvs_delete_form')); ?>
 			<?php echo form_hidden('receiving_id', $receiving_info['receiving_id']);?>
@@ -64,7 +64,7 @@
 				'class'=>'btn btn-danger btn-sm pull-right')
 			);
 			?>
-		</form>
+		<?php echo form_close(); ?>
 	</fieldset>
 </div>
 
@@ -162,7 +162,7 @@ $(document).ready(function()
 				if (confirm('<?php echo $this->lang->line("recvs_delete_confirmation"); ?>'))
 				{
 					tb_remove();
-					set_feedback(response.message,'success_message',false);
+					set_feedback(response.message, 'alert alert-dismissible alert-success', false);
 					var $element = get_table_row(id).parent().parent();
 					$element.find("td").animate({backgroundColor:"green"},1200,"linear")
 					.end().animate({opacity:0},1200,"linear",function()
@@ -176,7 +176,7 @@ $(document).ready(function()
 				return false;
 			},
 			error: function(jqXHR, textStatus, errorThrown) {
-				set_feedback(textStatus,'error_message',true);
+				set_feedback(textStatus, 'alert alert-dismissible alert-danger', true);
 			},
 			dataType:'json'
 		});
diff --git a/application/views/receivings/receipt.php b/application/views/receivings/receipt.php
index eca4b8149..4cdf7c08d 100644
--- a/application/views/receivings/receipt.php
+++ b/application/views/receivings/receipt.php
@@ -1,7 +1,6 @@
 <?php $this->load->view("partial/header"); ?>
 
-<?php $this->load->view('partial/print_receipt', array('print_after_sale', $print_after_sale, 
-		'selected_printer' => 'receipt_printer')); ?>
+<?php $this->load->view('partial/print_receipt', array('print_after_sale', $print_after_sale, 'selected_printer' => 'receipt_printer')); ?>
 
 <?php
 if (isset($error_message))
@@ -15,26 +14,28 @@ if (isset($error_message))
 		<?php if ($this->Appconfig->get('company_logo') == '') 
         { 
         ?>
-        <div id="company_name"><?php echo $this->config->item('company'); ?></div>
+			<div id="company_name"><?php echo $this->config->item('company'); ?></div>
 		<?php 
 		}
 		else 
 		{ 
 		?>
-		<div id="company_name"><img id="image" src="<?php echo base_url('uploads/' . $this->Appconfig->get('company_logo')); ?>" alt="company_logo" /></div>			
+			<div id="company_name"><img id="image" src="<?php echo base_url('uploads/' . $this->Appconfig->get('company_logo')); ?>" alt="company_logo" /></div>			
 		<?php
 		}
 		?>
+
 		<div id="company_address"><?php echo nl2br($this->config->item('address')); ?></div>
 		<div id="company_phone"><?php echo $this->config->item('phone'); ?></div>
 		<div id="sale_receipt"><?php echo $receipt_title; ?></div>
 		<div id="sale_time"><?php echo $transaction_time ?></div>
 	</div>
+
 	<div id="receipt_general_info">
 		<?php if(isset($supplier))
 		{
 		?>
-		<div id="customer"><?php echo $this->lang->line('suppliers_supplier').": ".$supplier; ?></div>
+			<div id="customer"><?php echo $this->lang->line('suppliers_supplier').": ".$supplier; ?></div>
 		<?php
 		}
 		?>
@@ -42,7 +43,7 @@ if (isset($error_message))
 		<?php if (!empty($invoice_number))
 		{
 		?>
-		<div id="invoice_number"><?php echo $this->lang->line('recvs_invoice_number').": ".$invoice_number; ?></div>	
+			<div id="invoice_number"><?php echo $this->lang->line('recvs_invoice_number').": ".$invoice_number; ?></div>	
 		<?php 
 		}
 		?>
@@ -50,75 +51,81 @@ if (isset($error_message))
 	</div>
 
 	<table id="receipt_items">
-	<tr>
-	<th style="width:40%;"><?php echo $this->lang->line('items_item'); ?></th>
-	<th style="width:20%;"><?php echo $this->lang->line('common_price'); ?></th>
-	<th style="width:20%;"><?php echo $this->lang->line('sales_quantity'); ?></th>
-	<th style="width:15%;text-align:right;"><?php echo $this->lang->line('sales_total'); ?></th>
-	</tr>
-	<?php
-	foreach(array_reverse($cart, true) as $line=>$item)
-	{
-	?>
 		<tr>
-		<td><span class='long_name'><?php echo base64_decode($item['name']); ?></span><span class='short_name'><?php echo character_limiter(base64_decode($item['name']),10); ?></span></td>
-		<td><?php echo to_currency($item['price']); ?></td>
-		<td><?php 
-			echo $item['quantity'] . " " . ($show_stock_locations ? " [" . $item['stock_name'] . "]" : ""); 
-		?>&nbsp;&nbsp;&nbsp;x <?php echo $item['receiving_quantity'] != 0 ? $item['receiving_quantity'] : 1; ?></td>
-		<td><div class="total-value"><?php echo to_currency($item['total']); ?></div></td>
-		</tr>
-	    <tr>
-		<td ><?php echo $item['serialnumber']; ?></td>
-	    </tr>
-	    <?php if ($item['discount'] > 0 ) : ?>
-		<tr>
-			<td colspan="3" style="font-weight: bold;"> <?php echo number_format($item['discount'], 0) . " " . $this->lang->line("sales_discount_included")?> </td>
-		</tr>
-		<?php endif; ?>
-	<?php
-	}
-	?>	
-	<tr>
-	<td colspan="3" style='text-align:right;border-top:2px solid #000000;'><?php echo $this->lang->line('sales_total'); ?></td>
-	<td style='border-top:2px solid #000000;'><div class="total-value"><?php echo to_currency($total); ?></div></td>
-	</tr>
-	<?php 
-    if($mode!='requisition')
-    {
-    ?>
-	<tr>
-	<td colspan="3" style='text-align:right;'><?php echo $this->lang->line('sales_payment'); ?></td>
-	<td><div class="total-value"><?php echo $payment_type; ?></div></td>
-	</tr>
-	
-
-	<?php if(isset($amount_change))
-	{
-	?>
-		<tr>
-		<td colspan="3" style='text-align:right;'><?php echo $this->lang->line('sales_amount_tendered'); ?></td>
-		<td><div class="total-value"><?php echo to_currency($amount_tendered); ?></div></td>
+			<th style="width:40%;"><?php echo $this->lang->line('items_item'); ?></th>
+			<th style="width:20%;"><?php echo $this->lang->line('common_price'); ?></th>
+			<th style="width:20%;"><?php echo $this->lang->line('sales_quantity'); ?></th>
+			<th style="width:15%;text-align:right;"><?php echo $this->lang->line('sales_total'); ?></th>
 		</tr>
 
+		<?php
+		foreach(array_reverse($cart, true) as $line=>$item)
+		{
+		?>
+			<tr>
+				<td><span class='long_name'><?php echo base64_decode($item['name']); ?></span><span class='short_name'><?php echo character_limiter(base64_decode($item['name']),10); ?></span></td>
+				<td><?php echo to_currency($item['price']); ?></td>
+				<td><?php echo $item['quantity'] . " " . ($show_stock_locations ? " [" . $item['stock_name'] . "]" : ""); 
+				?>&nbsp;&nbsp;&nbsp;x <?php echo $item['receiving_quantity'] != 0 ? $item['receiving_quantity'] : 1; ?></td>
+				<td><div class="total-value"><?php echo to_currency($item['total']); ?></div></td>
+			</tr>
+			<tr>
+				<td ><?php echo $item['serialnumber']; ?></td>
+			</tr>
+			<?php
+			if ($item['discount'] > 0 )
+			{
+			?>
+				<tr>
+					<td colspan="3" style="font-weight: bold;"> <?php echo number_format($item['discount'], 0) . " " . $this->lang->line("sales_discount_included")?> </td>
+				</tr>
+			<?php
+			}
+			?>
+		<?php
+		}
+		?>	
 		<tr>
-		<td colspan="3" style='text-align:right;'><?php echo $this->lang->line('sales_change_due'); ?></td>
-		<td><div class="total-value"><?php echo $amount_change; ?></div></td>
+			<td colspan="3" style='text-align:right;border-top:2px solid #000000;'><?php echo $this->lang->line('sales_total'); ?></td>
+			<td style='border-top:2px solid #000000;'><div class="total-value"><?php echo to_currency($total); ?></div></td>
 		</tr>
-	<?php
-	}
-	?>
-	<?php 
-    }
-    ?>
+		<?php 
+		if($mode!='requisition')
+		{
+		?>
+			<tr>
+				<td colspan="3" style='text-align:right;'><?php echo $this->lang->line('sales_payment'); ?></td>
+				<td><div class="total-value"><?php echo $payment_type; ?></div></td>
+			</tr>
+
+			<?php if(isset($amount_change))
+			{
+			?>
+				<tr>
+					<td colspan="3" style='text-align:right;'><?php echo $this->lang->line('sales_amount_tendered'); ?></td>
+					<td><div class="total-value"><?php echo to_currency($amount_tendered); ?></div></td>
+				</tr>
+
+				<tr>
+					<td colspan="3" style='text-align:right;'><?php echo $this->lang->line('sales_change_due'); ?></td>
+					<td><div class="total-value"><?php echo $amount_change; ?></div></td>
+				</tr>
+			<?php
+			}
+			?>
+		<?php 
+		}
+		?>
 	</table>
 
 	<div id="sale_return_policy">
 		<?php echo nl2br($this->config->item('return_policy')); ?>
 	</div>
+
 	<div id='barcode'>
 		<img src='data:image/png;base64,<?php echo $barcode; ?>' /><br>
 		<?php echo $receiving_id; ?>
 	</div>
 </div>
+
 <?php $this->load->view("partial/footer"); ?>
diff --git a/application/views/receivings/receiving.php b/application/views/receivings/receiving.php
index a66027124..00fd89cb0 100644
--- a/application/views/receivings/receiving.php
+++ b/application/views/receivings/receiving.php
@@ -5,7 +5,7 @@
 <?php
 if(isset($error))
 {
-	echo "<div class='error_message'>".$error."</div>";
+	echo "<div class='alert alert-dismissible alert-danger'>".$error."</div>";
 }
 ?>
 
@@ -32,31 +32,31 @@ if(isset($error))
 		}
 		}
 		?>    
-	</form>
+	<?php echo form_close(); ?>
 	
 	<?php echo form_open("receivings/add",array('id'=>'add_item_form')); ?>
-	
-	<label id="item_label" for="item">
-		<?php
-		if($mode=='receive' or $mode=='requisition')
-		{
-			echo $this->lang->line('recvs_find_or_scan_item');
-		}
-		else
-		{
-			echo $this->lang->line('recvs_find_or_scan_item_or_receipt');
-		}
-		?>
-	</label>
+		<label id="item_label" for="item">
+			<?php
+			if($mode=='receive' or $mode=='requisition')
+			{
+				echo $this->lang->line('recvs_find_or_scan_item');
+			}
+			else
+			{
+				echo $this->lang->line('recvs_find_or_scan_item_or_receipt');
+			}
+			?>
+		</label>
 
-	<?php echo form_input(array('name'=>'item','id'=>'item','size'=>'40'));?>
+		<?php echo form_input(array('name'=>'item','id'=>'item','size'=>'40'));?>
+		
 		<div id="new_item_button_register" >
 			<?php echo anchor("items/view/-1/width:450",
 			"<div class='btn btn-sm btn-info'><span>".$this->lang->line('sales_new_item')."</span></div>",
 			array('class'=>'thickbox none','title'=>$this->lang->line('sales_new_item')));
 			?>
 		</div>
-	</form>
+	<?php echo form_close(); ?>
 
 <!-- Receiving Items List -->
 
@@ -80,7 +80,7 @@ if(isset($error))
 			{
 			?>
 				<tr><td colspan='8'>
-					<div class='warning_message' style='padding:7px;'><?php echo $this->lang->line('sales_no_items_in_cart'); ?></div>
+					<div class='alert alert-dismissible alert-warning'><?php echo $this->lang->line('sales_no_items_in_cart'); ?></div>
 				</td></tr>
 			<?php
 			}
@@ -90,97 +90,97 @@ if(isset($error))
 				{
 					echo form_open("receivings/edit_item/$line");	
 			?>
-					<tr>
-					<td><?php echo anchor("receivings/delete_item/$line",'['.$this->lang->line('common_delete').']');?></td>
-					<td style="align:center;"><?php echo base64_decode($item['name']); ?><br /> [<?php echo $item['in_stock']; ?> in <?php echo $item['stock_name']; ?>]
-						<?php echo form_hidden('location', $item['item_location']); ?></td>
+						<tr>
+						<td><?php echo anchor("receivings/delete_item/$line",'['.$this->lang->line('common_delete').']');?></td>
+						<td style="align:center;"><?php echo base64_decode($item['name']); ?><br /> [<?php echo $item['in_stock']; ?> in <?php echo $item['stock_name']; ?>]
+							<?php echo form_hidden('location', $item['item_location']); ?></td>
 
-					<?php if ($items_module_allowed && $mode !='requisition')
-					{
-					?>
-						<td><?php echo form_input(array('name'=>'price','value'=>$item['price'],'size'=>'6'));?></td>
-					<?php
-					}
-					else
-					{
-					?>
-						<td><?php echo $item['price']; ?></td>
-						<?php echo form_hidden('price',$item['price']); ?>
-					<?php
-					}
-					?>
-					
-					<td>
-					<?php
-						echo form_input(array('name'=>'quantity','value'=>$item['quantity'],'size'=>'2'));
-						if ($item['receiving_quantity'] > 1) 
-						{
-					?>
-					</td>
-					<td>x <?php echo $item['receiving_quantity']; ?></td>	
-					<?php 
-						}
-						else
-						{
-					?>
-					<td></td>
-					<?php 
-						}
-					?>
-					
-					<?php       
-						if ($items_module_allowed && $mode!='requisition')
-						{
-					?>
-					<td><?php echo form_input(array('name'=>'discount','value'=>$item['discount'],'size'=>'3'));?></td>
-					<?php
-						}
-						else
-						{
-					?>
-						 <td><?php echo $item['discount']; ?></td>
-						 <?php echo form_hidden('discount',$item['discount']); ?>
-					<?php
-						}
-					?>
-					<td><?php echo to_currency($item['price']*$item['quantity']-$item['price']*$item['quantity']*$item['discount']/100); ?></td>
-					<td><?php echo form_submit("edit_item", $this->lang->line('sales_edit_item'));?></td>
-					</tr>
-					<tr>
-					<?php 
-						if($item['allow_alt_description']==1)
+						<?php if ($items_module_allowed && $mode !='requisition')
 						{
 						?>
-						<td style="color: #2F4F4F;"><?php echo $this->lang->line('sales_description_abbrv').':';?></td>
-						<?php 
-						} 
-						?>
-						<td colspan="2" style="text-align: left;">
-					
+							<td><?php echo form_input(array('name'=>'price','value'=>$item['price'],'size'=>'6'));?></td>
 						<?php
-							if($item['allow_alt_description']==1)
+						}
+						else
+						{
+						?>
+							<td><?php echo $item['price']; ?></td>
+							<?php echo form_hidden('price',$item['price']); ?>
+						<?php
+						}
+						?>
+						
+						<td>
+						<?php
+							echo form_input(array('name'=>'quantity','value'=>$item['quantity'],'size'=>'2'));
+							if ($item['receiving_quantity'] > 1) 
 							{
-								echo form_input(array('name'=>'description','value'=>base64_decode($item['description']),'size'=>'20'));
+						?>
+						</td>
+						<td>x <?php echo $item['receiving_quantity']; ?></td>	
+						<?php 
 							}
 							else
 							{
-								if (base64_decode($item['description'])!='')
+						?>
+						<td></td>
+						<?php 
+							}
+						?>
+						
+						<?php       
+							if ($items_module_allowed && $mode!='requisition')
+							{
+						?>
+						<td><?php echo form_input(array('name'=>'discount','value'=>$item['discount'],'size'=>'3'));?></td>
+						<?php
+							}
+							else
+							{
+						?>
+							 <td><?php echo $item['discount']; ?></td>
+							 <?php echo form_hidden('discount',$item['discount']); ?>
+						<?php
+							}
+						?>
+						<td><?php echo to_currency($item['price']*$item['quantity']-$item['price']*$item['quantity']*$item['discount']/100); ?></td>
+						<td><?php echo form_submit("edit_item", $this->lang->line('sales_edit_item'));?></td>
+						</tr>
+						<tr>
+						<?php 
+							if($item['allow_alt_description']==1)
+							{
+							?>
+							<td style="color: #2F4F4F;"><?php echo $this->lang->line('sales_description_abbrv').':';?></td>
+							<?php 
+							} 
+							?>
+							<td colspan="2" style="text-align: left;">
+						
+							<?php
+								if($item['allow_alt_description']==1)
 								{
-									echo base64_decode($item['description']);
-									echo form_hidden('description',base64_decode($item['description']));
+									echo form_input(array('name'=>'description','value'=>base64_decode($item['description']),'size'=>'20'));
 								}
 								else
 								{
-									echo $this->lang->line('sales_no_description');
-									echo form_hidden('description','');
+									if (base64_decode($item['description'])!='')
+									{
+										echo base64_decode($item['description']);
+										echo form_hidden('description',base64_decode($item['description']));
+									}
+									else
+									{
+										echo $this->lang->line('sales_no_description');
+										echo form_hidden('description','');
+									}
 								}
-							}
-						?>
-						</td>
-						<td colspan="6"></td>
-					</tr>
-					</form>
-				<?php
+							?>
+							</td>
+							<td colspan="6"></td>
+						</tr>
+					<?php
+					echo form_close();
 				}
 			}
 			?>
@@ -200,9 +200,9 @@ if(isset($error))
 	else
 	{
 		echo form_open("receivings/select_supplier",array('id'=>'select_supplier_form')); ?>
-		<label id="supplier_label" for="supplier"><?php echo $this->lang->line('recvs_select_supplier'); ?></label>
-		<?php echo form_input(array('name'=>'supplier','id'=>'supplier','size'=>'30','value'=>$this->lang->line('recvs_start_typing_supplier_name')));?>
-		</form>
+			<label id="supplier_label" for="supplier"><?php echo $this->lang->line('recvs_select_supplier'); ?></label>
+			<?php echo form_input(array('name'=>'supplier','id'=>'supplier','size'=>'30','value'=>$this->lang->line('recvs_start_typing_supplier_name')));?>
+		<?php echo form_close(); ?>
 		<div style="margin-top:5px;text-align:center;">
 		<h3 style="margin: 5px 0 5px 0"><?php echo $this->lang->line('common_or'); ?></h3>
 		<?php echo anchor("suppliers/view/-1/width:400",
@@ -231,123 +231,121 @@ if(isset($error))
 	{
 		if($mode == 'requisition')
 		{
-		?>
-		    
+	?>
 		    <div  style='border-top:2px solid #000;' />
 		    <div id="finish_sale">
 		        <?php echo form_open("receivings/requisition_complete",array('id'=>'finish_receiving_form')); ?>
-		        <br />
-		        <label id="comment_label" for="comment"><?php echo $this->lang->line('common_comments'); ?>:</label>
-		        <?php echo form_textarea(array('name'=>'comment','id'=>'comment','value'=>$comment,'rows'=>'4','cols'=>'23'));?>
-		        <br /><br />
-		        
-		        <div class="btn btn-sm btn-success" id='finish_receiving_button' style='float:right;margin-top:5px;'>
-		        	<span><?php echo $this->lang->line('recvs_complete_receiving') ?></span>
-		        </div>
-		        </form>    
-		        <?php echo form_open("receivings/cancel_receiving",array('id'=>'cancel_receiving_form')); ?>
-		        <div class="btn btn-sm btn-danger" id='cancel_receiving_button' style='float:left;margin-top:5px;'>
-		        <span><?php echo $this->lang->line('recvs_cancel_receiving')?></span>
-		        </div>
-		        </form>
+					<br />
+					<label id="comment_label" for="comment"><?php echo $this->lang->line('common_comments'); ?>:</label>
+					<?php echo form_textarea(array('name'=>'comment','id'=>'comment','value'=>$comment,'rows'=>'4','cols'=>'23'));?>
+					<br /><br />
+					
+					<div class="btn btn-sm btn-success" id='finish_receiving_button' style='float:right;margin-top:5px;'>
+						<span><?php echo $this->lang->line('recvs_complete_receiving') ?></span>
+					</div>
+					</form>    
+					<?php echo form_open("receivings/cancel_receiving",array('id'=>'cancel_receiving_form')); ?>
+					<div class="btn btn-sm btn-danger" id='cancel_receiving_button' style='float:left;margin-top:5px;'>
+						<span><?php echo $this->lang->line('recvs_cancel_receiving')?></span>
+					</div>
+				<?php echo form_close(); ?>
 		     </div>
 	    <?php
 	        }
 	        else
 	        {
-	?>
+		?>
 	<div id="finish_sale">
 		<?php echo form_open("receivings/complete",array('id'=>'finish_receiving_form')); ?>
-		<br />
-		<label id="comment_label" for="comment"><?php echo $this->lang->line('common_comments'); ?>:</label>
-		<?php echo form_textarea(array('name'=>'comment','id'=>'comment','value'=>$comment,'rows'=>'4','cols'=>'23'));?>
-		<br /><br />
-		<table width="100%">
-		<tr>
+			<br />
+			<label id="comment_label" for="comment"><?php echo $this->lang->line('common_comments'); ?>:</label>
+			<?php echo form_textarea(array('name'=>'comment','id'=>'comment','value'=>$comment,'rows'=>'4','cols'=>'23'));?>
+			<br /><br />
+			<table width="100%">
+			<tr>
+				<td>
+					<?php echo $this->lang->line('recvs_print_after_sale'); ?>
+				</td>
+				<td>
+					<?php if ($print_after_sale)
+					{
+						echo form_checkbox(array('name'=>'recv_print_after_sale','id'=>'recv_print_after_sale','checked'=>'checked'));
+					}
+					else
+					{
+						echo form_checkbox(array('name'=>'recv_print_after_sale','id'=>'recv_print_after_sale'));
+					}
+					?>
+				</td>
+			</tr>
+			<?php if ($mode == "receive") 
+			{
+			?>
+			<tr>
 			<td>
-				<?php echo $this->lang->line('recvs_print_after_sale'); ?>
+			<?php echo $this->lang->line('recvs_invoice_enable'); ?>
 			</td>
 			<td>
-				<?php if ($print_after_sale)
-				{
-					echo form_checkbox(array('name'=>'recv_print_after_sale','id'=>'recv_print_after_sale','checked'=>'checked'));
-				}
-				else
-				{
-					echo form_checkbox(array('name'=>'recv_print_after_sale','id'=>'recv_print_after_sale'));
-				}
-				?>
+			<?php if ($invoice_number_enabled)
+			{
+				echo form_checkbox(array('name'=>'recv_invoice_enable','id'=>'recv_invoice_enable','size'=>10,'checked'=>'checked'));
+			}
+			else
+			{
+				echo form_checkbox(array('name'=>'recv_invoice_enable','id'=>'recv_invoice_enable','size'=>10));
+			}
+			?>
 			</td>
-		</tr>
-		<?php if ($mode == "receive") 
-		{
-		?>
-		<tr>
-		<td>
-		<?php echo $this->lang->line('recvs_invoice_enable'); ?>
-		</td>
-		<td>
-		<?php if ($invoice_number_enabled)
-		{
-			echo form_checkbox(array('name'=>'recv_invoice_enable','id'=>'recv_invoice_enable','size'=>10,'checked'=>'checked'));
-		}
-		else
-		{
-			echo form_checkbox(array('name'=>'recv_invoice_enable','id'=>'recv_invoice_enable','size'=>10));
-		}
-		?>
-		</td>
-		</tr>
-		
-		<tr>
-		<td>
-		<?php echo $this->lang->line('recvs_invoice_number').':   ';?>
-		</td>
-		<td>
-		<?php echo form_input(array('name'=>'recv_invoice_number','id'=>'recv_invoice_number','value'=>$invoice_number,'size'=>10));?>
-		</td>
-		</tr>
-		<?php 
-		}
-		?>
-		<tr><td>
-		<?php
-			echo $this->lang->line('sales_payment').':   ';?>
-		</td><td>
-		<?php
-		    echo form_dropdown('payment_type',$payment_options);?>
-        </td>
-        </tr>
+			</tr>
+			
+			<tr>
+			<td>
+			<?php echo $this->lang->line('recvs_invoice_number').':   ';?>
+			</td>
+			<td>
+			<?php echo form_input(array('name'=>'recv_invoice_number','id'=>'recv_invoice_number','value'=>$invoice_number,'size'=>10));?>
+			</td>
+			</tr>
+			<?php 
+			}
+			?>
+			<tr><td>
+			<?php
+				echo $this->lang->line('sales_payment').':   ';?>
+			</td><td>
+			<?php
+				echo form_dropdown('payment_type',$payment_options);?>
+			</td>
+			</tr>
 
-        <tr>
-        <td>
-        <?php
-			echo $this->lang->line('sales_amount_tendered').':   ';?>
-		</td><td>
-		<?php
-		    echo form_input(array('name'=>'amount_tendered','value'=>'','size'=>'10'));
-		?>
-        </td>
-        </tr>
+			<tr>
+			<td>
+			<?php
+				echo $this->lang->line('sales_amount_tendered').':   ';?>
+			</td><td>
+			<?php
+				echo form_input(array('name'=>'amount_tendered','value'=>'','size'=>'10'));
+			?>
+			</td>
+			</tr>
 
-        </table>
-        <br />
-		<div class='btn btn-sm btn-success' id='finish_receiving_button' style='float:right;margin-top:5px;'>
-			<span><?php echo $this->lang->line('recvs_complete_receiving') ?></span>
-		</div>
-        
-		</form>
+			</table>
+			<br />
+			<div class='btn btn-sm btn-success' id='finish_receiving_button' style='float:right;margin-top:5px;'>
+				<span><?php echo $this->lang->line('recvs_complete_receiving') ?></span>
+			</div>
+		<?php echo form_close(); ?>
 
 	    <?php echo form_open("receivings/cancel_receiving",array('id'=>'cancel_receiving_form')); ?>
 			    <div class='btn btn-sm btn-danger' id='cancel_receiving_button' style='float:left;margin-top:5px;'>
 					<span><?php echo $this->lang->line('recvs_cancel_receiving')?></span>
 				</div>
-        </form>
+		<?php echo form_close(); ?>
 	</div>
-	<?php
+<?php
 	}
 }
-	?>
+?>
 
 </div>
 <div class="clearfix" style="margin-bottom:30px;">&nbsp;</div>
diff --git a/application/views/reports/date_input.php b/application/views/reports/date_input.php
index 12a6dd779..cce2e7e89 100644
--- a/application/views/reports/date_input.php
+++ b/application/views/reports/date_input.php
@@ -3,7 +3,7 @@
 <?php
 if(isset($error))
 {
-	echo "<div class='error_message'>".$error."</div>";
+	echo "<div class='alert alert-dismissible alert-danger'>".$error."</div>";
 }
 ?>
 	<?php echo form_label($this->lang->line('reports_date_range'), 'report_date_range_label', array('class'=>'required')); ?>
diff --git a/application/views/reports/date_input_excel_export.php b/application/views/reports/date_input_excel_export.php
index a246f38b2..2fa88d7ce 100644
--- a/application/views/reports/date_input_excel_export.php
+++ b/application/views/reports/date_input_excel_export.php
@@ -3,7 +3,7 @@
 <?php
 if(isset($error))
 {
-	echo "<div class='error_message'>".$error."</div>";
+	echo "<div class='alert alert-dismissible alert-danger'>".$error."</div>";
 }
 ?>
 	<?php echo form_label($this->lang->line('reports_date_range'), 'report_date_range_label', array('class'=>'required')); ?>
diff --git a/application/views/reports/excel_export.php b/application/views/reports/excel_export.php
index 28d48f084..75f61df23 100644
--- a/application/views/reports/excel_export.php
+++ b/application/views/reports/excel_export.php
@@ -3,7 +3,7 @@
 <?php
 if(isset($error))
 {
-	echo "<div class='error_message'>".$error."</div>";
+	echo "<div class='alert alert-dismissible alert-danger'>".$error."</div>";
 }
 ?>
 	<div>
diff --git a/application/views/reports/inventory_summary_input.php b/application/views/reports/inventory_summary_input.php
index 14800324b..64f7f3e94 100644
--- a/application/views/reports/inventory_summary_input.php
+++ b/application/views/reports/inventory_summary_input.php
@@ -3,7 +3,7 @@
 <?php
 if(isset($error))
 {
-	echo "<div class='error_message'>".$error."</div>";
+	echo "<div class='alert alert-dismissible alert-danger'>".$error."</div>";
 }
 ?>
 	<div>
diff --git a/application/views/reports/listing.php b/application/views/reports/listing.php
index c6c1eb82f..9e9455a43 100644
--- a/application/views/reports/listing.php
+++ b/application/views/reports/listing.php
@@ -61,7 +61,7 @@
 <?php
 if(isset($error))
 {
-	echo "<div class='error_message'>".$error."</div>";
+	echo "<div class='alert alert-dismissible alert-danger'>".$error."</div>";
 }
 ?>
 <?php $this->load->view("partial/footer"); ?>
\ No newline at end of file
diff --git a/application/views/reports/specific_input.php b/application/views/reports/specific_input.php
index 3e65bb2cb..ad373e9a2 100644
--- a/application/views/reports/specific_input.php
+++ b/application/views/reports/specific_input.php
@@ -3,7 +3,7 @@
 <?php
 if(isset($error))
 {
-	echo "<div class='error_message'>".$error."</div>";
+	echo "<div class='alert alert-dismissible alert-danger'>".$error."</div>";
 }
 ?>
 	<?php echo form_label($this->lang->line('reports_date_range'), 'report_date_range_label', array('class'=>'required')); ?>
diff --git a/application/views/reports/tabular_details.php b/application/views/reports/tabular_details.php
index 4d8aef4df..e694d2742 100644
--- a/application/views/reports/tabular_details.php
+++ b/application/views/reports/tabular_details.php
@@ -1,14 +1,19 @@
 <?php 
-//OJB: Check if for excel export process
-if($export_excel == 1){
+// Check if for excel export process
+if($export_excel == 1)
+{
 	ob_start();
 	$this->load->view("partial/header_excel");
-}else{
+}
+else
+{
 	$this->load->view("partial/header");
 } 
 ?>
+
 <div id="page_title" style="margin-bottom:8px;"><?php echo $title ?></div>
 <div id="page_subtitle" style="margin-bottom:8px;"><?php echo $subtitle ?></div>
+
 <div id="table_holder">
 	<table class="tablesorter report" id="sortable_table">
 		<thead>
@@ -54,18 +59,16 @@ if($export_excel == 1){
 		</tbody>
 	</table>
 </div>
+
 <div id="report_summary">
-<?php foreach($overall_summary_data as $name=>$value) { ?>
-	<div class="summary_row"><?php echo $this->lang->line('reports_'.$name). ': '.to_currency($value); ?></div>
-<?php }?>
+	<?php foreach($overall_summary_data as $name=>$value) { ?>
+		<div class="summary_row"><?php echo $this->lang->line('reports_'.$name). ': '.to_currency($value); ?></div>
+	<?php }?>
 </div>
 
-<?php if (isset($editable)): ?>
-<div id="feedback_bar"></div>
-<?php endif; ?>
-
 <?php 
-if($export_excel == 1){
+if($export_excel == 1)
+{
 	$this->load->view("partial/footer_excel");
 	$content = ob_end_flush();
 	
@@ -76,79 +79,80 @@ if($export_excel == 1){
 	header('Content-Disposition: attachment; filename='.$filename);
 	echo $content;
 	die();
-	
-}else{
+}
+else
+{
 	$this->load->view("partial/footer"); 
 ?>
-<script type="text/javascript" language="javascript">
-
-<?php if (isset($editable)): ?>
-
-function post_form_submit(response, row_id)
-{
-	if(!response.success)
+	<script type="text/javascript" language="javascript">
+	<?php
+	if (isset($editable))
 	{
-		set_feedback(response.message,'error_message',true);
-	}
-	else
-	{
-		var row_id = response.id
-		$.get('<?php echo site_url("reports/get_detailed_" . $editable . "_row")?>/'+row_id, function(response)
+	?>
+		function post_form_submit(response, row_id)
 		{
-			//Replace previous row
-			var row = get_table_row(row_id).parent().parent();
-			var sign = row.find("a.expand").text();
-			row.replaceWith(response);	
-			row = get_table_row(row_id).parent().parent();
-			update_sortable_table();
-			animate_row(row);
-			row.find("a.expand").click(expand_handler).text(sign);
-			tb_init(row.find("a.thickbox"));
-		});
-		set_feedback(response.message,'success_message',false);
+			if(!response.success)
+			{
+				set_feedback(response.message, 'alert alert-dismissible alert-danger', true);
+			}
+			else
+			{
+				var row_id = response.id
+				$.get('<?php echo site_url("reports/get_detailed_" . $editable . "_row")?>/'+row_id, function(response)
+				{
+					//Replace previous row
+					var row = get_table_row(row_id).parent().parent();
+					var sign = row.find("a.expand").text();
+					row.replaceWith(response);	
+					row = get_table_row(row_id).parent().parent();
+					update_sortable_table();
+					animate_row(row);
+					row.find("a.expand").click(expand_handler).text(sign);
+					tb_init(row.find("a.thickbox"));
+				});
+				set_feedback(response.message, 'alert alert-dismissible alert-success', false);
+			}
+		}
+	<?php
 	}
-}
+	?>
 
-<?php endif; ?>
-
-function expand_handler(event)
-{
-	$(event.target).parent().parent().next().find('.innertable').toggle();
-
-	if ($(event.target).text() == '+')
+	function expand_handler(event)
 	{
-		$(event.target).text('-');
-	}
-	else
-	{
-		$(event.target).text('+');
-	}
-	return false;
-};
+		$(event.target).parent().parent().next().find('.innertable').toggle();
 
-$(document).ready(function()
-{
-	
-	$(".tablesorter a.expand_all").click(function(event)
-	{
-		var $inner_elements = $(".tablesorter .innertable");
-		if ($inner_elements.is(":visible")) 
+		if ($(event.target).text() == '+')
 		{
-			$inner_elements.hide();
-			$("a.expand, a.expand_all").text('+');
-		} 
-		else 
+			$(event.target).text('-');
+		}
+		else
 		{
-			$inner_elements.show();
-			$("a.expand, a.expand_all").text('-');
-		} 
+			$(event.target).text('+');
+		}
 		return false;
+	};
+
+	$(document).ready(function()
+	{
+		$(".tablesorter a.expand_all").click(function(event)
+		{
+			var $inner_elements = $(".tablesorter .innertable");
+			if ($inner_elements.is(":visible")) 
+			{
+				$inner_elements.hide();
+				$("a.expand, a.expand_all").text('+');
+			} 
+			else 
+			{
+				$inner_elements.show();
+				$("a.expand, a.expand_all").text('-');
+			} 
+			return false;
+		});
+		
+		$(".tablesorter a.expand").click(expand_handler);
 	});
-	
-	$(".tablesorter a.expand").click(expand_handler);
-	
-});
-</script>
+	</script>
 <?php 
 } // end if not is excel export 
 ?>
\ No newline at end of file
diff --git a/application/views/sales/form.php b/application/views/sales/form.php
index 05c4d4a3b..69f4d41aa 100755
--- a/application/views/sales/form.php
+++ b/application/views/sales/form.php
@@ -4,73 +4,74 @@
 	
 	<fieldset id="sale_basic_info">
 		<?php echo form_open("sales/save/".$sale_info['sale_id'],array('id'=>'sales_edit_form')); ?>
-		<legend><?php echo $this->lang->line("sales_basic_information"); ?></legend>
-		
-		<div class="field_row clearfix">
-			<?php echo form_label($this->lang->line('sales_receipt_number').':', 'customer'); ?>
-			<div class='form_field'>
-				<?php echo anchor('sales/receipt/'.$sale_info['sale_id'], $this->lang->line('sales_receipt_number') .$sale_info['sale_id'], array('target' => '_blank'));?>
+			<legend><?php echo $this->lang->line("sales_basic_information"); ?></legend>
+			
+			<div class="field_row clearfix">
+				<?php echo form_label($this->lang->line('sales_receipt_number').':', 'customer'); ?>
+				<div class='form_field'>
+					<?php echo anchor('sales/receipt/'.$sale_info['sale_id'], $this->lang->line('sales_receipt_number') .$sale_info['sale_id'], array('target' => '_blank'));?>
+				</div>
 			</div>
-		</div>
-		
-		<div class="field_row clearfix">
-			<?php echo form_label($this->lang->line('sales_date').':', 'date'); ?>
-			<div class='form_field'>
-				<?php echo form_input(array('name'=>'date','value'=>date($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), strtotime($sale_info['sale_time'])), 'id'=>'datetime', 'readonly'=>'true'));?>
+			
+			<div class="field_row clearfix">
+				<?php echo form_label($this->lang->line('sales_date').':', 'date'); ?>
+				<div class='form_field'>
+					<?php echo form_input(array('name'=>'date','value'=>date($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), strtotime($sale_info['sale_time'])), 'id'=>'datetime', 'readonly'=>'true'));?>
+				</div>
 			</div>
-		</div>
-		
-		<div class="field_row clearfix">
-			<?php echo form_label($this->lang->line('sales_invoice_number').':', 'invoice_number'); ?>
-			<div class='form_field'>
-				<?php if (isset($sale_info["invoice_number"]) && !empty($sale_info["invoice_number"]) && 
-					isset($sale_info['customer_id']) && isset($sale_info['email']) && !empty($sale_info['email'])): ?>
-					<?php echo form_input(array('name'=>'invoice_number', 'size'=>10, 'value'=>$sale_info['invoice_number'], 'id'=>'invoice_number'));?>
-					<a id="send_invoice" href="javascript:void(0);"><?=$this->lang->line('sales_send_invoice')?></a>
-				<?php else: ?>
-					<?php echo form_input(array('name'=>'invoice_number', 'value'=>$sale_info['invoice_number'], 'id'=>'invoice_number'));?>
-				<?php endif; ?>
+			
+			<div class="field_row clearfix">
+				<?php echo form_label($this->lang->line('sales_invoice_number').':', 'invoice_number'); ?>
+				<div class='form_field'>
+					<?php if (isset($sale_info["invoice_number"]) && !empty($sale_info["invoice_number"]) && 
+						isset($sale_info['customer_id']) && isset($sale_info['email']) && !empty($sale_info['email'])): ?>
+						<?php echo form_input(array('name'=>'invoice_number', 'size'=>10, 'value'=>$sale_info['invoice_number'], 'id'=>'invoice_number'));?>
+						<a id="send_invoice" href="javascript:void(0);"><?=$this->lang->line('sales_send_invoice')?></a>
+					<?php else: ?>
+						<?php echo form_input(array('name'=>'invoice_number', 'value'=>$sale_info['invoice_number'], 'id'=>'invoice_number'));?>
+					<?php endif; ?>
+				</div>
 			</div>
-		</div>
-		
-		<div class="field_row clearfix">
-			<?php echo form_label($this->lang->line('sales_customer').':', 'customer'); ?>
-			<div class='form_field'>
-				<?php echo form_input(array('name' => 'customer_id', 'value' => $selected_customer, 'id' => 'customer_id'));?>
+			
+			<div class="field_row clearfix">
+				<?php echo form_label($this->lang->line('sales_customer').':', 'customer'); ?>
+				<div class='form_field'>
+					<?php echo form_input(array('name' => 'customer_id', 'value' => $selected_customer, 'id' => 'customer_id'));?>
+				</div>
 			</div>
-		</div>
-		
-		<div class="field_row clearfix">
-			<?php echo form_label($this->lang->line('sales_employee').':', 'employee'); ?>
-			<div class='form_field'>
-				<?php echo form_dropdown('employee_id', $employees, $sale_info['employee_id'], 'id="employee_id"');?>
+			
+			<div class="field_row clearfix">
+				<?php echo form_label($this->lang->line('sales_employee').':', 'employee'); ?>
+				<div class='form_field'>
+					<?php echo form_dropdown('employee_id', $employees, $sale_info['employee_id'], 'id="employee_id"');?>
+				</div>
 			</div>
-		</div>
-		
-		<div class="field_row clearfix">
-			<?php echo form_label($this->lang->line('sales_comment').':', 'comment'); ?>
-			<div class='form_field'>
-				<?php echo form_textarea(array('name'=>'comment', 'value'=>$sale_info['comment'], 'rows'=>'4','cols'=>'23', 'id'=>'comment'));?>
+			
+			<div class="field_row clearfix">
+				<?php echo form_label($this->lang->line('sales_comment').':', 'comment'); ?>
+				<div class='form_field'>
+					<?php echo form_textarea(array('name'=>'comment', 'value'=>$sale_info['comment'], 'rows'=>'4','cols'=>'23', 'id'=>'comment'));?>
+				</div>
 			</div>
-		</div>
-		
-		<?php echo form_submit(array(
-			'name'=>'submit',
-			'value'=>$this->lang->line('common_submit'),
-			'class'=> 'btn btn-primary btn-sm pull-right')
-		);
-		?>
-		</form>
+			
+			<?php echo form_submit(array(
+				'name'=>'submit',
+				'value'=>$this->lang->line('common_submit'),
+				'class'=> 'btn btn-primary btn-sm pull-right')
+			);
+			?>
+		<?php echo form_close(); ?>
 		
 		<?php echo form_open("sales/delete/".$sale_info['sale_id'],array('id'=>'sales_delete_form')); ?>
 			<?php echo form_hidden('sale_id', $sale_info['sale_id']);?>
 			<?php echo form_submit(array(
 				'name'=>'submit',
 				'value'=>$this->lang->line('sales_delete_entire_sale'),
-				'class'=>'btn btn-danger btn-sm pull-right')
+				'class'=>'btn btn-danger btn-sm pull-right',
+				'style'=>'margin-right: 10px;')
 			);
 			?>
-		</form>
+		<?php echo form_close(); ?>
 	</fieldset>
 </div>
 
@@ -184,7 +185,7 @@ $(document).ready(function()
 				success: function(response)
 				{
 					tb_remove();
-					set_feedback(response.message,'success_message',false);
+					set_feedback(response.message, 'alert alert-dismissible alert-success', false);
 					var $element = get_table_row(id).parent().parent();
 					$element.find("td").animate({backgroundColor:"green"},1200,"linear")
 					.end().animate({opacity:0},1200,"linear",function()
@@ -196,7 +197,7 @@ $(document).ready(function()
 					});
 				},
 				error: function(jqXHR, textStatus, errorThrown) {
-					set_feedback(textStatus,'error_message',true);
+					set_feedback(textStatus, 'alert alert-dismissible alert-danger', true);
 				},
 				dataType:'json'
 			});
diff --git a/application/views/sales/manage.php b/application/views/sales/manage.php
index ab44fb64e..5b93a3085 100755
--- a/application/views/sales/manage.php
+++ b/application/views/sales/manage.php
@@ -59,12 +59,12 @@ function post_form_submit(response)
 {
 	if(!response.success)
 	{
-		set_feedback(response.message,'error_message',true);
+		set_feedback(response.message, 'alert alert-dismissible alert-danger', true);
 	}
 	else
 	{
 		update_row(response.id,'<?php echo site_url("$controller_name/get_row")?>');
-		set_feedback(response.message,'success_message',false);
+		set_feedback(response.message, 'alert alert-dismissible alert-success', false);
 	}
 }
 
@@ -72,7 +72,7 @@ function post_bulk_form_submit(response)
 {
 	if(!response.success)
 	{
-		set_feedback(response.message,'error_message',true);
+		set_feedback(response.message, 'alert alert-dismissible alert-danger', true);
 	}
 	else
 	{
@@ -80,7 +80,7 @@ function post_bulk_form_submit(response)
 		{
 			update_row(response.ids[id],'<?php echo site_url("$controller_name/get_row")?>');
 		}
-		set_feedback(response.message,'success_message',false);
+		set_feedback(response.message, 'alert alert-dismissible alert-success', false);
 	}
 }
 
@@ -171,44 +171,47 @@ function init_table_sorting()
 	<div id="title" class="float_left"><?php echo $this->lang->line('common_list_of').' '.$this->lang->line('sales_receipt_number'); ?></div>
 	<a href="javascript:window.print()"><div class="btn btn-info btn-sm pull-right"><span><?php echo $this->lang->line('common_print'); ?></span></div></a>
 </div>
+
 <div id="pagination"><?= $links ?></div>
+
 <div id="titleTextImg" style="background-color:#EEEEEE;height:30px;position:relative;">
 	<div style="float:left;vertical-align:text-top;"><?php echo $this->lang->line('common_search_options'). ': '; ?></div>
 	<a id="imageDivLink" href="javascript:show_hide_search_filter('search_filter_section', 'imageDivLink');" style="outline:none;">
 	<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')); ?>
-<div id="search_filter_section" style="display: <?php echo isset($search_section_state)?  ( ($search_section_state)? 'block' : 'none') : 'none';?>;background-color:#EEEEEE;">
-	<?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_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')) . ' | ';?>
-	<?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));?>
-	<input type="hidden" name="search_section_state" id="search_section_state" value="<?php echo isset($search_section_state)?  ( ($search_section_state)? 'block' : 'none') : 'none';?>" />
-</div>
-<div id="table_action_header">
-	<ul>
-		<li class="float_left"><span><?php echo anchor($controller_name . "/delete",$this->lang->line("common_delete"),array('id'=>'delete')); ?></span></li>
-		<!-- li class="float_left"><span><?php echo anchor($controller_name . "/update_invoice_numbers", $this->lang->line('sales_invoice_update'),array('id'=>'update_invoice_numbers')); ?></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'/>
-		<input type="hidden" name ='limit_from' id='limit_from'/>
-		</li>
-	</ul>
-</div>
+	<div id="search_filter_section" style="display: <?php echo isset($search_section_state)?  ( ($search_section_state)? 'block' : 'none') : 'none';?>;background-color:#EEEEEE;">
+		<?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_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')) . ' | ';?>
+		<?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));?>
+		<input type="hidden" name="search_section_state" id="search_section_state" value="<?php echo isset($search_section_state)?  ( ($search_section_state)? 'block' : 'none') : 'none';?>" />
+	</div>
+
+	<div id="table_action_header">
+		<ul>
+			<li class="float_left"><span><?php echo anchor($controller_name . "/delete",$this->lang->line("common_delete"),array('id'=>'delete')); ?></span></li>
+			<!-- li class="float_left"><span><?php echo anchor($controller_name . "/update_invoice_numbers", $this->lang->line('sales_invoice_update'),array('id'=>'update_invoice_numbers')); ?></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'/>
+			<input type="hidden" name ='limit_from' id='limit_from'/>
+			</li>
+		</ul>
+	</div>
 <?php echo form_close(); ?>
 
 <div id="table_holder" class="totals">
-<?php echo $manage_table; ?>
+	<?php echo $manage_table; ?>
 </div>
 
 <div id="payment_summary">
-<?php echo $payments_summary; ?>
+	<?php echo $payments_summary; ?>
 </div>
 
-<div id="feedback_bar"></div>
 <?php $this->load->view("partial/footer"); ?>
diff --git a/application/views/sales/register.php b/application/views/sales/register.php
index 5cf1d3eff..c8e502cc3 100644
--- a/application/views/sales/register.php
+++ b/application/views/sales/register.php
@@ -6,17 +6,17 @@
 <?php
 if (isset($error))
 {
-	echo "<div class='error_message'>".$error."</div>";
+	echo "<div class='alert alert-dismissible alert-danger'>".$error."</div>";
 }
 
 if (isset($warning))
 {
-	echo "<div class='warning_mesage'>".$warning."</div>";
+	echo "<div class='alert alert-dismissible alert-warning'>".$warning."</div>";
 }
 
 if (isset($success))
 {
-	echo "<div class='success_message'>".$success."</div>";
+	echo "<div class='alert alert-dismissible alert-success'>".$success."</div>";
 }
 ?>
 
@@ -46,10 +46,10 @@ if (isset($success))
 		?>
 
 		<?php echo anchor("sales/suspended/width:425",
-		"<div class='btn btn-warning btn-sm' id='show_suspended_sales_button'><span>".$this->lang->line('sales_suspended_sales')."</span></div>",
+		"<div class='btn btn-default btn-sm' id='show_suspended_sales_button'><span>".$this->lang->line('sales_suspended_sales')."</span></div>",
 		array('class'=>'thickbox none','title'=>$this->lang->line('sales_suspended_sales')));
 		?>
-	</form>
+	<?php echo form_close(); ?>
 
 	<?php echo form_open("sales/add", array('id'=>'add_item_form')); ?>
 		<label id="item_label" for="item"> 
@@ -64,7 +64,7 @@ if (isset($success))
 			array('class'=>'thickbox none','title'=>$this->lang->line('sales_new_item')));
 			?>
 		</div>
-	</form>
+	<?php echo form_close(); ?>
 
 	<table id="register">
 		<thead>
@@ -86,7 +86,7 @@ if (isset($success))
 			?>
 				<tr>
 					<td colspan='8'>
-						<div class='warning_message' style='padding: 7px;'><?php echo $this->lang->line('sales_no_items_in_cart'); ?></div>
+						<div class='alert alert-dismissible alert-warning'><?php echo $this->lang->line('sales_no_items_in_cart'); ?></div>
 					</td>
 				</tr>
 			<?php
@@ -99,107 +99,108 @@ if (isset($success))
 					if($tabindex == 3) 
 					{
 						$tabindex = 5;
-					}					
+					}
+
 					echo form_open("sales/edit_item/$line");
 			?>
-					<tr>
-						<td><?php echo anchor("sales/delete_item/$line",'['.$this->lang->line('common_delete').']');?></td>
-						<td><?php echo $item['item_number']; ?></td>
-						<td style="align: center;"><?php echo base64_decode($item['name']); ?><br /> [<?php echo $item['in_stock'] ?> in <?php echo $item['stock_name']; ?>]
-							<?php echo form_hidden('location', $item['item_location']); ?>
-						</td>
+						<tr>
+							<td><?php echo anchor("sales/delete_item/$line",'['.$this->lang->line('common_delete').']');?></td>
+							<td><?php echo $item['item_number']; ?></td>
+							<td style="align: center;"><?php echo base64_decode($item['name']); ?><br /> [<?php echo $item['in_stock'] ?> in <?php echo $item['stock_name']; ?>]
+								<?php echo form_hidden('location', $item['item_location']); ?>
+							</td>
 
-						<?php if ($items_module_allowed)
-						{
-						?>
-							<td><?php echo form_input(array('name'=>'price','value'=>$item['price'],'size'=>'6'));?></td>
-						<?php
-						}
-						else
-						{
-						?>
-							<td><?php echo to_currency($item['price']); ?></td>
-							<?php echo form_hidden('price',$item['price']); ?>
-						<?php
-						}
-						?>
-
-						<td>
-						<?php
-							if($item['is_serialized']==1)
+							<?php if ($items_module_allowed)
 							{
-								echo $item['quantity'];
-								echo form_hidden('quantity',$item['quantity']);
+							?>
+								<td><?php echo form_input(array('name'=>'price','value'=>$item['price'],'size'=>'6'));?></td>
+							<?php
 							}
 							else
-							{								
-				        		echo form_input(array('name'=>'quantity','value'=>$item['quantity'],'size'=>'2','tabindex'=>$tabindex));
-							}
-						?>
-						</td>
-
-						<td><?php echo form_input(array('name'=>'discount','value'=>$item['discount'],'size'=>'3'));?></td>
-						<td><?php echo to_currency($item['price']*$item['quantity']-$item['price']*$item['quantity']*$item['discount']/100); ?></td>
-						<td><?php echo form_submit("edit_item", $this->lang->line('sales_edit_item'));?></td>
-					</tr>
-					<tr>
-						<?php 
-						if($item['allow_alt_description']==1)
-						{
-						?>
-							<td style="color: #2F4F4F;"><?php echo $this->lang->line('sales_description_abbrv').':';?></td>
-						<?php 
-						}
-						?>
-
-						<td colspan=2 style="text-align: left;">
+							{
+							?>
+								<td><?php echo to_currency($item['price']); ?></td>
+								<?php echo form_hidden('price',$item['price']); ?>
 							<?php
+							}
+							?>
+
+							<td>
+							<?php
+								if($item['is_serialized']==1)
+								{
+									echo $item['quantity'];
+									echo form_hidden('quantity',$item['quantity']);
+								}
+								else
+								{								
+									echo form_input(array('name'=>'quantity','value'=>$item['quantity'],'size'=>'2','tabindex'=>$tabindex));
+								}
+							?>
+							</td>
+
+							<td><?php echo form_input(array('name'=>'discount','value'=>$item['discount'],'size'=>'3'));?></td>
+							<td><?php echo to_currency($item['price']*$item['quantity']-$item['price']*$item['quantity']*$item['discount']/100); ?></td>
+							<td><?php echo form_submit("edit_item", $this->lang->line('sales_edit_item'));?></td>
+						</tr>
+						<tr>
+							<?php 
 							if($item['allow_alt_description']==1)
 							{
-								echo form_input(array('name'=>'description','value'=>base64_decode($item['description']),'size'=>'20'));
+							?>
+								<td style="color: #2F4F4F;"><?php echo $this->lang->line('sales_description_abbrv').':';?></td>
+							<?php 
 							}
-							else
-							{
-								if (base64_decode($item['description'])!='')
+							?>
+
+							<td colspan=2 style="text-align: left;">
+								<?php
+								if($item['allow_alt_description']==1)
 								{
-									echo base64_decode($item['description']);
-									echo form_hidden('description',base64_decode($item['description']));
+									echo form_input(array('name'=>'description','value'=>base64_decode($item['description']),'size'=>'20'));
 								}
 								else
 								{
-									echo $this->lang->line('sales_no_description');
-									echo form_hidden('description','');
+									if (base64_decode($item['description'])!='')
+									{
+										echo base64_decode($item['description']);
+										echo form_hidden('description',base64_decode($item['description']));
+									}
+									else
+									{
+										echo $this->lang->line('sales_no_description');
+										echo form_hidden('description','');
+									}
 								}
-							}
-							?>
-						</td>
-						<td>&nbsp;</td>
-						<td style="color: #2F4F4F;">
-							<?php
-							if($item['is_serialized']==1)
-							{
-								echo $this->lang->line('sales_serial').':';
-							}
-							?>
-						</td>
-						<td colspan="4" style="text-align: left;">
-							<?php
-							if($item['is_serialized']==1)
-							{
-								echo form_input(array('name'=>'serialnumber','value'=>$item['serialnumber'],'size'=>'20'));
-							}
-							else
-							{
-								echo form_hidden('serialnumber', '');
-							}
-							?>
-						</td>
-					</tr>
-					<tr style="height: 3px">
-						<td colspan=8 style="background-color: white"></td>
-					</tr>
+								?>
+							</td>
+							<td>&nbsp;</td>
+							<td style="color: #2F4F4F;">
+								<?php
+								if($item['is_serialized']==1)
+								{
+									echo $this->lang->line('sales_serial').':';
+								}
+								?>
+							</td>
+							<td colspan="4" style="text-align: left;">
+								<?php
+								if($item['is_serialized']==1)
+								{
+									echo form_input(array('name'=>'serialnumber','value'=>$item['serialnumber'],'size'=>'20'));
+								}
+								else
+								{
+									echo form_hidden('serialnumber', '');
+								}
+								?>
+							</td>
+						</tr>
+						<tr style="height: 3px">
+							<td colspan=8 style="background-color: white"></td>
+						</tr>
 
-					</form>
+					<?php echo form_close(); ?>
 			<?php					
 					$tabindex = $tabindex + 1;					
 				}
@@ -220,10 +221,10 @@ if (isset($success))
 	{
 		echo form_open("sales/select_customer",array('id'=>'select_customer_form'));
 	?>
-		<label id="customer_label" for="customer"><?php echo $this->lang->line('sales_select_customer'); ?></label>
-		<?php echo form_input(array('name'=>'customer','id'=>'customer','size'=>'30','value'=>$this->lang->line('sales_start_typing_customer_name')));?>
+			<label id="customer_label" for="customer"><?php echo $this->lang->line('sales_select_customer'); ?></label>
+			<?php echo form_input(array('name'=>'customer','id'=>'customer','size'=>'30','value'=>$this->lang->line('sales_start_typing_customer_name')));?>
 
-		</form>
+		<?php echo form_close(); ?>
 
 		<div style="margin-top: 5px; text-align: center;">
 			<h3 style="margin: 5px 0 5px 0"><?php echo $this->lang->line('common_or'); ?></h3>
@@ -263,12 +264,12 @@ if (isset($success))
 				<span><?php echo $this->lang->line('sales_cancel_sale'); ?></span>
 			</div>
 			
-			<div class='btn btn-sm btn-warning' id='suspend_sale_button' style='float:right; margin-top: 5px;'>
+			<div class='btn btn-sm btn-default' id='suspend_sale_button' style='float:right; margin-top: 5px;'>
 				<span><?php echo $this->lang->line('sales_suspend_sale'); ?></span>
 			</div>
 		</div>
 	
-		</form>
+		<?php echo form_close(); ?>
 
 		<div class="clearfix" style="margin-bottom: 1px;">&nbsp;</div>
 
@@ -276,35 +277,33 @@ if (isset($success))
 		// Only show this part if there is at least one payment entered.
 		if(count($payments) > 0)
 		{
+			echo form_open("sales/complete", array('id'=>'finish_sale_form'));
 		?>
-			<?php echo form_open("sales/complete", array('id'=>'finish_sale_form')); ?>
-
-			<div id="finish_sale">
-				<label id="comment_label" for="comment"><?php echo $this->lang->line('common_comments'); ?>:</label>
-				<?php echo form_textarea(array('name'=>'comment', 'id'=>'comment', 'value'=>$comment, 'rows'=>'4', 'cols'=>'23'));?>
-				<br />
-				<br />
-				<?php
-				if(!empty($customer_email))
-				{
-					echo $this->lang->line('sales_email_receipt'). ': '
-						. form_checkbox(array(
-					    'name'    => 'email_receipt',
-					    'id'      => 'email_receipt',
-					    'value'   => '1',
-					    'checked' => (boolean)$email_receipt,
-					    )).'<br />('.$customer_email.')<br />';
-				}
-				 
-				if ($payments_cover_total)
-				{					
-					echo "<div class='btn btn-sm btn-success' id='finish_sale_button' style='float:left; margin-top:5px;' tabindex='3'><span>".$this->lang->line('sales_complete_sale')."</span></div>";
-				}
-				?>
-			</div>
-
-			</form>
-		<?php
+				<div id="finish_sale">
+					<label id="comment_label" for="comment"><?php echo $this->lang->line('common_comments'); ?>:</label>
+					<?php echo form_textarea(array('name'=>'comment', 'id'=>'comment', 'value'=>$comment, 'rows'=>'4', 'cols'=>'23'));?>
+					<br />
+					<br />
+					<?php
+					if(!empty($customer_email))
+					{
+						echo $this->lang->line('sales_email_receipt'). ': '
+							. form_checkbox(array(
+							'name'    => 'email_receipt',
+							'id'      => 'email_receipt',
+							'value'   => '1',
+							'checked' => (boolean)$email_receipt,
+							)).'<br />('.$customer_email.')<br />';
+					}
+					 
+					if ($payments_cover_total)
+					{					
+						echo "<div class='btn btn-sm btn-success' id='finish_sale_button' style='float:left; margin-top:5px;' tabindex='3'><span>".$this->lang->line('sales_complete_sale')."</span></div>";
+					}
+					?>
+				</div>
+			<?php 
+			echo form_close();
 		}
 		?>
 
@@ -324,78 +323,77 @@ if (isset($success))
 		<div id="payment_details">
 			<div>
 				<?php echo form_open("sales/add_payment",array('id'=>'add_payment_form')); ?>
-				<table width="100%">
-					<tr>
-						<td>
-							<?php echo $this->lang->line('sales_print_after_sale'); ?>
-						</td>
-						<td>
-							<?php
-							if ($print_after_sale)
-							{
-								echo form_checkbox(array('name'=>'sales_print_after_sale','id'=>'sales_print_after_sale','checked'=>'checked'));
-							}
-							else
-							{
-								echo form_checkbox(array('name'=>'sales_print_after_sale','id'=>'sales_print_after_sale'));
-							}
-							?>
-						</td>
-					</tr>
-					<?php
-					if ($mode == "sale") 
-					{
-					?>
-					<tr>
-						<td>
-							<?php echo $this->lang->line('sales_invoice_enable'); ?>
-						</td>
-						<td>
-							<?php if ($invoice_number_enabled)
-							{
-								echo form_checkbox(array('name'=>'sales_invoice_enable','id'=>'sales_invoice_enable','checked'=>'checked'));
-							}
-							else
-							{
-								echo form_checkbox(array('name'=>'sales_invoice_enable','id'=>'sales_invoice_enable'));
-							}
-							?>
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<?php echo $this->lang->line('sales_invoice_number').':   ';?>
-						</td>
-						<td>
-							<?php echo form_input(array('name'=>'sales_invoice_number','id'=>'sales_invoice_number','value'=>$invoice_number,'size'=>10));?>
-						</td>
-					</tr>
-					<?php 
-					}
-					?>
-					<tr>
-						<td>
-							<?php echo $this->lang->line('sales_payment').':   ';?>
-						</td>
-						<td>
-							<?php echo form_dropdown( 'payment_type', $payment_options, array(), 'id="payment_types"' ); ?>
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<span id="amount_tendered_label"><?php echo $this->lang->line( 'sales_amount_tendered' ).': '; ?></span>
-						</td>
-						<td>
-							<?php echo form_input( array( 'name'=>'amount_tendered', 'id'=>'amount_tendered', 'value'=>to_currency_no_money($amount_due), 'size'=>'10','tabindex'=>4 ) ); ?>
-						</td>
-					</tr>
-				</table>
-				
-				<div class='btn btn-sm btn-primary' id='add_payment_button' style='float: left; margin-top: 5px;'>
-					<span><?php echo $this->lang->line('sales_add_payment'); ?></span>
-				</div>
-
-				</form>
+					<table width="100%">
+						<tr>
+							<td>
+								<?php echo $this->lang->line('sales_print_after_sale'); ?>
+							</td>
+							<td>
+								<?php
+								if ($print_after_sale)
+								{
+									echo form_checkbox(array('name'=>'sales_print_after_sale','id'=>'sales_print_after_sale','checked'=>'checked'));
+								}
+								else
+								{
+									echo form_checkbox(array('name'=>'sales_print_after_sale','id'=>'sales_print_after_sale'));
+								}
+								?>
+							</td>
+						</tr>
+						<?php
+						if ($mode == "sale") 
+						{
+						?>
+						<tr>
+							<td>
+								<?php echo $this->lang->line('sales_invoice_enable'); ?>
+							</td>
+							<td>
+								<?php if ($invoice_number_enabled)
+								{
+									echo form_checkbox(array('name'=>'sales_invoice_enable','id'=>'sales_invoice_enable','checked'=>'checked'));
+								}
+								else
+								{
+									echo form_checkbox(array('name'=>'sales_invoice_enable','id'=>'sales_invoice_enable'));
+								}
+								?>
+							</td>
+						</tr>
+						<tr>
+							<td>
+								<?php echo $this->lang->line('sales_invoice_number').':   ';?>
+							</td>
+							<td>
+								<?php echo form_input(array('name'=>'sales_invoice_number','id'=>'sales_invoice_number','value'=>$invoice_number,'size'=>10));?>
+							</td>
+						</tr>
+						<?php 
+						}
+						?>
+						<tr>
+							<td>
+								<?php echo $this->lang->line('sales_payment').':   ';?>
+							</td>
+							<td>
+								<?php echo form_dropdown( 'payment_type', $payment_options, array(), 'id="payment_types"' ); ?>
+							</td>
+						</tr>
+						<tr>
+							<td>
+								<span id="amount_tendered_label"><?php echo $this->lang->line( 'sales_amount_tendered' ).': '; ?></span>
+							</td>
+							<td>
+								<?php echo form_input( array( 'name'=>'amount_tendered', 'id'=>'amount_tendered', 'value'=>to_currency_no_money($amount_due), 'size'=>'10','tabindex'=>4 ) ); ?>
+							</td>
+						</tr>
+					</table>
+					
+					<div class='btn btn-sm btn-primary' id='add_payment_button' style='float: left; margin-top: 5px;'>
+						<span><?php echo $this->lang->line('sales_add_payment'); ?></span>
+					</div>
+				<?php echo form_close(); ?>
 			</div>
 
 			<?php
@@ -418,14 +416,13 @@ if (isset($success))
 						{
 							echo form_open("sales/edit_payment/$payment_id",array('id'=>'edit_payment_form'.$payment_id));
 							?>
-							<tr>
-								<td><?php echo anchor( "sales/delete_payment/$payment_id", '['.$this->lang->line('common_delete').']' ); ?></td>
-								<td><?php echo $payment['payment_type']; ?></td>
-								<td style="text-align: right;"><?php echo to_currency( $payment['payment_amount'] ); ?></td>
-							</tr>
-							
-							</form>
-						<?php
+								<tr>
+									<td><?php echo anchor( "sales/delete_payment/$payment_id", '['.$this->lang->line('common_delete').']' ); ?></td>
+									<td><?php echo $payment['payment_type']; ?></td>
+									<td style="text-align: right;"><?php echo to_currency( $payment['payment_amount'] ); ?></td>
+								</tr>
+							<?php 
+							echo form_close();
 						}
 						?>
 					</tbody>
@@ -434,9 +431,7 @@ if (isset($success))
 			<?php
 			}
 			?>
-
 		</div>
-
 	<?php
 	}
 	?>
diff --git a/application/views/sales/suspended.php b/application/views/sales/suspended.php
index 8fecd9c43..170eb328b 100644
--- a/application/views/sales/suspended.php
+++ b/application/views/sales/suspended.php
@@ -35,8 +35,10 @@
 				echo form_open('sales/unsuspend');
 				echo form_hidden('suspended_sale_id', $suspended_sale['sale_id']);
 				?>
-				<input type="submit" name="submit" value="<?php echo $this->lang->line('sales_unsuspend'); ?>" id="submit" class="submit_button float_right"></td>
-				</form>
+					<input type="submit" name="submit" value="<?php echo $this->lang->line('sales_unsuspend'); ?>" id="submit" class="btn btn-primary btn-xs pull-right"></td>
+				<?php
+				echo form_close();
+				?>
 		</tr>
 	<?php
 	}
diff --git a/application/views/suppliers/form.php b/application/views/suppliers/form.php
index 0dcbf90c9..cd2604f55 100644
--- a/application/views/suppliers/form.php
+++ b/application/views/suppliers/form.php
@@ -1,58 +1,54 @@
-<?php
-echo form_open('suppliers/save/'.$person_info->person_id,array('id'=>'supplier_form'));
-?>
-<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
-<ul id="error_message_box" class="error_message_box"></ul>
-<fieldset id="supplier_basic_info">
-<legend><?php echo $this->lang->line("suppliers_basic_information"); ?></legend>
+<?php echo form_open('suppliers/save/'.$person_info->person_id,array('id'=>'supplier_form')); ?>
+	<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+	<ul id="error_message_box" class="error_message_box"></ul>
+	<fieldset id="supplier_basic_info">
+	<legend><?php echo $this->lang->line("suppliers_basic_information"); ?></legend>
 
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('suppliers_company_name').':', 'company_name', array('class'=>'required')); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'company_name',
-		'id'=>'company_name_input',
-		'value'=>$person_info->company_name)
-	);?>
+	<div class="field_row clearfix">	
+	<?php echo form_label($this->lang->line('suppliers_company_name').':', 'company_name', array('class'=>'required')); ?>
+		<div class='form_field'>
+		<?php echo form_input(array(
+			'name'=>'company_name',
+			'id'=>'company_name_input',
+			'value'=>$person_info->company_name)
+		);?>
+		</div>
 	</div>
-</div>
 
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('suppliers_agency_name').':', 'agency_name'); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'agency_name',
-		'id'=>'agency_name_input',
-		'value'=>$person_info->agency_name)
-	);?>
+	<div class="field_row clearfix">	
+	<?php echo form_label($this->lang->line('suppliers_agency_name').':', 'agency_name'); ?>
+		<div class='form_field'>
+		<?php echo form_input(array(
+			'name'=>'agency_name',
+			'id'=>'agency_name_input',
+			'value'=>$person_info->agency_name)
+		);?>
+		</div>
 	</div>
-</div>
 
-<?php $this->load->view("people/form_basic_info"); ?>
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('suppliers_account_number').':', 'account_number'); ?>
-	<div class='form_field'>
-	<?php echo form_input(array(
-		'name'=>'account_number',
-		'id'=>'account_number',
-		'value'=>$person_info->account_number)
-	);?>
+	<?php $this->load->view("people/form_basic_info"); ?>
+	<div class="field_row clearfix">	
+	<?php echo form_label($this->lang->line('suppliers_account_number').':', 'account_number'); ?>
+		<div class='form_field'>
+		<?php echo form_input(array(
+			'name'=>'account_number',
+			'id'=>'account_number',
+			'value'=>$person_info->account_number)
+		);?>
+		</div>
 	</div>
-</div>
-<?php
-echo form_submit(array(
-	'name'=>'submit',
-	'id'=>'submit',
-	'value'=>$this->lang->line('common_submit'),
-	'class'=>'btn btn-primary btn-sm pull-right')
-);
-?>
-</fieldset>
-<?php 
-echo form_close();
-?>
+	<?php
+	echo form_submit(array(
+		'name'=>'submit',
+		'id'=>'submit',
+		'value'=>$this->lang->line('common_submit'),
+		'class'=>'btn btn-primary btn-sm pull-right')
+	);
+	?>
+	</fieldset>
+<?php echo form_close(); ?>
+
 <script type='text/javascript'>
-
 //validation and submit handling
 $(document).ready(function()
 {
diff --git a/application/views/suppliers/manage.php b/application/views/suppliers/manage.php
index de2b9c27b..99b78d619 100644
--- a/application/views/suppliers/manage.php
+++ b/application/views/suppliers/manage.php
@@ -1,4 +1,5 @@
 <?php $this->load->view("partial/header"); ?>
+
 <script type="text/javascript">
 $(document).ready(function() 
 { 
@@ -32,7 +33,7 @@ function post_person_form_submit(response)
 {
 	if(!response.success)
 	{
-		set_feedback(response.message,'error_message',true);	
+		set_feedback(response.message, 'alert alert-dismissible alert-danger', true);	
 	}
 	else
 	{
@@ -40,7 +41,7 @@ function post_person_form_submit(response)
 		if(jQuery.inArray(response.person_id,get_visible_checkbox_ids()) != -1)
 		{
 			update_row(response.person_id,'<?php echo site_url("$controller_name/get_row")?>');
-			set_feedback(response.message,'success_message',false);	
+			set_feedback(response.message, 'alert alert-dismissible alert-success', false);	
 			
 		}
 		else //refresh entire table
@@ -49,7 +50,7 @@ function post_person_form_submit(response)
 			{
 				//highlight new row
 				hightlight_row(response.person_id);
-				set_feedback(response.message,'success_message',false);		
+				set_feedback(response.message, 'alert alert-dismissible alert-success', false);		
 			});
 		}
 	}
@@ -63,22 +64,26 @@ function post_person_form_submit(response)
 	array('class'=>'thickbox none', 'title'=>$this->lang->line($controller_name . '_new')));
 	?>
 </div>
+
 <div id="pagination"><?= $links ?></div>
+
 <div id="table_action_header">
 	<ul>
 		<li class="float_left"><span><?php echo anchor("$controller_name/delete",$this->lang->line("common_delete"),array('id'=>'delete')); ?></span></li>
 		<li class="float_left"><span><a href="#" id="email"><?php echo $this->lang->line("common_email");?></a></span></li>
 		<li class="float_right">
-		<img src='<?php echo base_url()?>images/spinner_small.gif' alt='spinner' id='spinner' />
-		<?php echo form_open("$controller_name/search",array('id'=>'search_form')); ?>
-		<input type="text" name ='search' id='search'/>
-		<input type="hidden" name ='limit_from' id='limit_from'/>
-		</form>
+			<img src='<?php echo base_url()?>images/spinner_small.gif' alt='spinner' id='spinner' />
+
+			<?php echo form_open("$controller_name/search",array('id'=>'search_form')); ?>
+				<input type="text" name ='search' id='search'/>
+				<input type="hidden" name ='limit_from' id='limit_from'/>
+			<?php echo form_close(); ?>
 		</li>
 	</ul>
 </div>
+
 <div id="table_holder">
-<?php echo $manage_table; ?>
+	<?php echo $manage_table; ?>
 </div>
-<div id="feedback_bar"></div>
+
 <?php $this->load->view("partial/footer"); ?>
\ No newline at end of file
diff --git a/css/general.css b/css/general.css
index 9ba839b73..b4bdbf28c 100644
--- a/css/general.css
+++ b/css/general.css
@@ -44,41 +44,8 @@ label.required
 	float:right;
 }
 
-.warning_message
-{
-	text-align:center;
-	background-color:#fffcdd;
-	border:1px solid #fff4aa;
-	font-weight:bold;
-}
-
-.error_message
-{
-	text-align:center;
-	background-color:#f68383;
-	border:1px solid #da3232;
-	font-weight:bold;
-}
-
-.warning_mesage
-{
-	text-align:center;
-	background-color:#FBEC5D;
-	border:1px solid #da3232;
-	font-weight:bold;
-}
-
-.success_message
-{
-	text-align:center;
-	background-color:#e1ffdd;
-	border:1px solid #2ca71c;
-	font-weight:bold;
-}
-
 input
 {
-	font-family: Arial;
 	padding: 3px;
 }
 
@@ -92,6 +59,17 @@ input
 	height: 0;
 }
 
-.clearfix { display: inline-block; }
-html[xmlns] .clearfix {	display: block; }
-* html .clearfix { height: 1%; }
+.clearfix
+{
+	display: inline-block;
+}
+
+html[xmlns] .clearfix
+{
+	display: block;
+}
+
+* html .clearfix
+{
+	height: 1%;
+}
diff --git a/css/ospos.css b/css/ospos.css
index bc8fdd996..a232b78bd 100644
--- a/css/ospos.css
+++ b/css/ospos.css
@@ -12,69 +12,79 @@
 @import url(jquery-ui.theme.css);
 @import url(jquery-ui-timepicker-addon.css);
 
-body
+html, body
 {
-	margin:0px;
-	padding:0px;
-	background-color:#f7f7f7;
-	font-family: Arial, sans-serif, "Lucida Grande", "Trebuchet MS", Tahoma, Verdana;
-	font-size: 0.9em;
+	height: 100%;
 }
 
 a.none
 {
-	text-decoration:none;
+	text-decoration: none;
 }
 
-
-#content_area_wrapper
+.topbar
 {
-	position:relative;
-	width:100%;
-	background-color:#FFFFFF;	
-	margin:0px;
-	padding-bottom: 10px;
-	border-bottom:1px solid #CCCCCC;
-	text-align:center;	
-
+	color: #eee;
+	font-size: 12px;
+	background: #182735;
+	padding: 5px;
 }
 
-#content_area
+.navbar
 {
-	position:relative;
-	margin:0 auto;
-	width:875px;
-	text-align:left;
-	
+	min-height: 40px;
+	border-radius: 0;
+}
+
+.navbar-brand
+{
+	padding: 22px 15px;
+	height: 40px;
+}
+
+.navbar-default .navbar-nav > .active > a, 
+.navbar-default .navbar-nav > .active > a:hover, 
+.navbar-default .navbar-nav > .active > a:focus
+{
+	color: #2C3E50 !important;
+	background-color: #FFFFFF !important;
+}
+
+.navbar .menu-icon {
+	text-align: center;
+	font-size: 12px;
+}
+
+.navbar .menu-icon img {
+	width: 24px;
+}
+
+.wrapper
+{
+	min-height: 100%;
+	margin-bottom: -75px;
+	font-size: 14px;
+	line-height: 1.5;
 }
 
 #title_bar
 {
-	position:relative;
-	margin-top:10px;
-	margin-bottom:10px;
-	width:100%;
-	height:50px;
+	position: relative;
+	margin-top: 10px;
+	margin-bottom: 10px;
+	width: 100%;
+	height: 50px;
 }
 
-#title
-{
-	position:absolute;
-	bottom:0px;
-	left:0px;
-	font-size:30px;
-	font-weight:bold;
-	color:#000000;
-}	
-
-#page_title
-{
-	margin-top:8px;
-	font-size:30px;
-	font-weight:bold;
-	color:#000000;
-	text-align:center;
-
+#title,
+#page_title {
+	font-size: 22px;
+	margin-top: 21px;
+	margin-bottom: 10.5px;
+	font-family: "Lato", "Helvetica Neue", Helvetica, Arial, sans-serif;
+	font-weight: 400;
+	line-height: 1.1;
+	color: inherit;
 }
 
 #page_subtitle
@@ -86,41 +96,42 @@ a.none
 	text-align:center;
 }
 
-#new_button
-{
-	position:absolute;
-	bottom:-5px;
-	right:0px;
-}
-
 #spinner
 {
-        float:right;	
+	float:right;	
 	display:none;
 }
 
 #feedback_bar
 {
-	position:fixed;
-	bottom:0;
-	left:0;
-	width:100%;
-	height:55px;	
-	position:fixed;
-	opacity: 0;
-	filter: alpha(opacity=0);
-	z-index:1;
-	line-height:3.3;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	z-index: 1;
+	line-height: 3.3;
+	text-align: center;
 }
 
 #home_module_list
 {
 	position: relative;
+	padding: 20px 0;
+	text-align: center;
 }
 
-.module_item
+.module_item 
 {
 	padding: 10px;
+	min-width: 105px;
+	display: inline-block;
+	text-align: center;
+	margin-bottom: 3px;
+}
+
+.module_item a
+{
+	display: block;
 }
 
 #config_wrapper
@@ -152,7 +163,6 @@ a.none
 	font-size:11px;
 	color:#777777;
 	clear:both;
-	
 }
 
 input#search
diff --git a/css/ospos_print.css b/css/ospos_print.css
index 7136b74e7..31f905e9b 100644
--- a/css/ospos_print.css
+++ b/css/ospos_print.css
@@ -4,19 +4,14 @@
 	font-size:75%;
 }
 
-#menubar,#footer
+.topbar
 {
 	display:none;
 }
 
-#content_area
+#menubar, #footer
 {
-	width:100%;
-}
-
-#content_area_wrapper
-{
-	border:0px;
+	display:none;
 }
 
 #sale_return_policy
diff --git a/css/register.css b/css/register.css
index d9ccf1e15..7f53efe3d 100644
--- a/css/register.css
+++ b/css/register.css
@@ -73,10 +73,10 @@
 
 #register th
 {	
-	background-color:#4386a1;
-	padding:5px;
-	text-align:center;
-	color:#FFFFFF;
+	background-color: #999999;
+	padding: 5px;
+	text-align: center;
+	color: #FFFFFF;
 }
 
 #register td
diff --git a/database/migrate_phppos_dist.sql b/database/migrate_phppos_dist.sql
index 4b67245ca..96de768cf 100644
--- a/database/migrate_phppos_dist.sql
+++ b/database/migrate_phppos_dist.sql
@@ -245,7 +245,6 @@ CREATE TABLE `ospos_item_kit_items` (
 -- Dumping data for table `ospos_item_kit_items`
 --
 
-
 -- --------------------------------------------------------
 
 --
@@ -663,7 +662,6 @@ CREATE TABLE `ospos_sessions` (
 -- Dumping data for table `ospos_sessions`
 --
 
-
 -- --------------------------------------------------------
 
 --
@@ -704,11 +702,10 @@ CREATE TABLE `ospos_suppliers` (
 --
 
 
+
 --
 -- This migration script should be run after creating tables with the regular database script and before applying the constraints.
 --
--- This script migrates data from phppos to ospos 2.3.4
---
 
 --
 -- Copy data to table `ospos_app_config`
@@ -873,6 +870,11 @@ SELECT `person_id`, `company_name`, `account_number`, `deleted` FROM `phppos`.ph
 -- Add constraints on copied data
 --
 
+
+--
+-- Constraints for dumped tables
+--
+
 --
 -- Constraints for table `ospos_customers`
 --
diff --git a/dist/opensourcepos.min.js b/dist/opensourcepos.min.js
index 5b2e1ae35..64fa322b6 100644
--- a/dist/opensourcepos.min.js
+++ b/dist/opensourcepos.min.js
@@ -1,4 +1,4 @@
-/*! opensourcepos 25-01-2016 */
+/*! opensourcepos 08-02-2016 */
 function get_dimensions(){var a={width:0,height:0};return"number"==typeof window.innerWidth?(a.width=window.innerWidth,a.height=window.innerHeight):document.documentElement&&(document.documentElement.clientWidth||document.documentElement.clientHeight)?(a.width=document.documentElement.clientWidth,a.height=document.documentElement.clientHeight):document.body&&(document.body.clientWidth||document.body.clientHeight)&&(a.width=document.body.clientWidth,a.height=document.body.clientHeight),a}function set_feedback(a,b,c){a?($("#feedback_bar").removeClass().addClass(b).html(a).css("opacity","1"),c||$("#feedback_bar").fadeTo(5e3,1).fadeTo("fast",0)):$("#feedback_bar").css("opacity","0")}function checkbox_click(a){a.stopPropagation(),do_email(enable_email.url),$(a.target).attr("checked")?$(a.target).parent().parent().find("td").addClass("selected").css("backgroundColor",""):$(a.target).parent().parent().find("td").removeClass()}function enable_search(a){a.format_item||(format_item=function(a){return a[0]}),enable_search.enabled||(enable_search.enabled=!0),$("#search").click(function(){$(this).attr("value","")});var b=$("#search").autocomplete(a.suggest_url,{max:100,delay:10,selectFirst:!1,formatItem:a.format_item,extraParams:a.extra_params});return $("#search").result(function(){do_search(!0,a.on_complete)}),attach_search_listener(),$("#search_form").submit(function(b){b.preventDefault(),$("#limit_from").val(0),get_selected_values().length>0&&!confirm(a.confirm_search_message)||do_search(!0,a.on_complete)}),b}function attach_search_listener(){$("#pagination a").click(function(a){if($("#search").val()||$("#search_form input:checked")){a.preventDefault();var b=a.currentTarget.href.split("/"),c=b.pop();$("#limit_from").val(c),do_search(!0)}})}function do_search(a,b){enable_search.enabled&&(a&&$("#search").addClass("ac_loading"),$.post($("#search_form").attr("action"),$("#search_form").serialize(),function(a){$("#sortable_table tbody").html(a.rows),"function"==typeof b&&b(a),$("#search").removeClass("ac_loading"),tb_init("#sortable_table a.thickbox"),$("#pagination").html(a.pagination),$("#sortable_table tbody :checkbox").click(checkbox_click),$("#select_all").attr("checked",!1),a.total_rows>0&&(update_sortable_table(),enable_row_selection()),attach_search_listener()},"json"))}function enable_email(a){enable_email.enabled||(enable_email.enabled=!0),enable_email.url||(enable_email.url=a),$("#select_all, #sortable_table tbody :checkbox").click(checkbox_click)}function do_email(a){enable_email.enabled&&$.post(a,{"ids[]":get_selected_values()},function(a){$("#email").attr("href",a)})}function enable_checkboxes(){$("#sortable_table tbody :checkbox").click(checkbox_click)}function enable_delete(a,b){enable_delete.enabled||(enable_delete.enabled=!0),$("#delete").click(function(c){if(c.preventDefault(),$("#sortable_table tbody :checkbox:checked").length>0){if(!confirm(a))return!1;do_delete($(this).attr("href"))}else alert(b)})}function do_delete(a){if(enable_delete.enabled){var b=get_selected_values(),c=get_selected_rows();$.post(a,{"ids[]":b},function(a){a.success?($(c).each(function(){$(this).find("td").animate({backgroundColor:"green"},1200,"linear").end().animate({opacity:0},1200,"linear",function(){$(this).remove(),$("#sortable_table tbody tr").length>0&&update_sortable_table()})}),set_feedback(a.message,"success_message",!1)):set_feedback(a.message,"error_message",!0)},"json")}}function enable_bulk_edit(a){enable_bulk_edit.enabled||(enable_bulk_edit.enabled=!0),$("#bulk_edit").click(function(b){b.preventDefault(),$("#sortable_table tbody :checkbox:checked").length>0?(tb_show($(this).attr("title"),$(this).attr("href"),!1),$(this).blur()):alert(a)})}function enable_select_all(){enable_select_all.enabled||(enable_select_all.enabled=!0),$("#select_all").click(function(){$("#sortable_table tbody :checkbox").each($(this).attr("checked")?function(){$(this).attr("checked",!0),$(this).parent().parent().find("td").addClass("selected").css("backgroundColor","")}:function(){$(this).attr("checked",!1),$(this).parent().parent().find("td").removeClass()})})}function enable_row_selection(a){enable_row_selection.enabled||(enable_row_selection.enabled=!0),"undefined"==typeof a&&(a=$("#sortable_table tbody tr")),a.hover(function(){$(this).find("td").addClass("over").css("backgroundColor",""),$(this).css("cursor","pointer")},function(){$(this).find("td").hasClass("selected")||$(this).find("td").removeClass()}),a.click(function(){var a=$(this).find(":checkbox");a.attr("checked",!a.attr("checked")),do_email(enable_email.url),a.attr("checked")?$(this).find("td").addClass("selected").css("backgroundColor",""):$(this).find("td").removeClass()})}function update_sortable_table(){if($("#sortable_table").trigger("update"),"undefined"!=typeof $("#sortable_table")[0].config){var a=$("#sortable_table")[0].config.sortList;$("#sortable_table").trigger("sorton",[a])}else window.init_table_sorting&&init_table_sorting()}function get_table_row(a){a=a||$("input[name='sale_id']").val();var b=$("#sortable_table tbody :checkbox[value='"+a+"']");return 0===b.length&&(b=$("#sortable_table tbody a[href*='/"+a+"/']")),b}function update_row(a,b,c){$.post(b,{row_id:a},function(b){var d=get_table_row(a).parent().parent();d.replaceWith(b),reinit_row(a),hightlight_row(a),c&&"function"==typeof c&&c()},"html")}function reinit_row(a){var b=$("#sortable_table tbody tr :checkbox[value="+a+"]"),c=b.parent().parent();enable_row_selection(c),update_sortable_table(),tb_init(c.find("a.thickbox")),b.click(checkbox_click)}function animate_row(a,b){b=b||"#e1ffdd",a.find("td").css("backgroundColor","#ffffff").animate({backgroundColor:b},"slow","linear").animate({backgroundColor:b},5e3).animate({backgroundColor:"#ffffff"},"slow","linear")}function hightlight_row(a){var b=$("#sortable_table tbody tr :checkbox[value="+a+"]"),c=b.parent().parent();animate_row(c)}function get_selected_values(){var a=new Array;return $("#sortable_table tbody :checkbox:checked").each(function(){a.push($(this).val())}),a}function get_selected_rows(){var a=new Array;return $("#sortable_table tbody :checkbox:checked").each(function(){a.push($(this).parent().parent())}),a}function get_visible_checkbox_ids(){var a=new Array;return $("#sortable_table tbody :checkbox").each(function(){a.push($(this).val())}),a}function phpjsDate(a,b){var c,d,e=this,f=["Sun","Mon","Tues","Wednes","Thurs","Fri","Satur","January","February","March","April","May","June","July","August","September","October","November","December"],g=/\\?(.?)/gi,h=function(a,b){return d[a]?d[a]():b},i=function(a,b){for(a=String(a);a.length<b;)a="0"+a;return a};return d={d:function(){return i(d.j(),2)},D:function(){return d.l().slice(0,3)},j:function(){return c.getDate()},l:function(){return f[d.w()]+"day"},N:function(){return d.w()||7},S:function(){var a=d.j(),b=a%10;return 3>=b&&1==parseInt(a%100/10,10)&&(b=0),["st","nd","rd"][b-1]||"th"},w:function(){return c.getDay()},z:function(){var a=new Date(d.Y(),d.n()-1,d.j()),b=new Date(d.Y(),0,1);return Math.round((a-b)/864e5)},W:function(){var a=new Date(d.Y(),d.n()-1,d.j()-d.N()+3),b=new Date(a.getFullYear(),0,4);return i(1+Math.round((a-b)/864e5/7),2)},F:function(){return f[6+d.n()]},m:function(){return i(d.n(),2)},M:function(){return d.F().slice(0,3)},n:function(){return c.getMonth()+1},t:function(){return new Date(d.Y(),d.n(),0).getDate()},L:function(){var a=d.Y();return a%4===0&a%100!==0|a%400===0},o:function(){var a=d.n(),b=d.W(),c=d.Y();return c+(12===a&&9>b?1:1===a&&b>9?-1:0)},Y:function(){return c.getFullYear()},y:function(){return d.Y().toString().slice(-2)},a:function(){return c.getHours()>11?"pm":"am"},A:function(){return d.a().toUpperCase()},B:function(){var a=3600*c.getUTCHours(),b=60*c.getUTCMinutes(),d=c.getUTCSeconds();return i(Math.floor((a+b+d+3600)/86.4)%1e3,3)},g:function(){return d.G()%12||12},G:function(){return c.getHours()},h:function(){return i(d.g(),2)},H:function(){return i(d.G(),2)},i:function(){return i(c.getMinutes(),2)},s:function(){return i(c.getSeconds(),2)},u:function(){return i(1e3*c.getMilliseconds(),6)},e:function(){throw"Not supported (see source code of date() for timezone on how to add support)"},I:function(){var a=new Date(d.Y(),0),b=Date.UTC(d.Y(),0),c=new Date(d.Y(),6),e=Date.UTC(d.Y(),6);return a-b!==c-e?1:0},O:function(){var a=c.getTimezoneOffset(),b=Math.abs(a);return(a>0?"-":"+")+i(100*Math.floor(b/60)+b%60,4)},P:function(){var a=d.O();return a.substr(0,3)+":"+a.substr(3,2)},T:function(){return"UTC"},Z:function(){return 60*-c.getTimezoneOffset()},c:function(){return"Y-m-d\\TH:i:sP".replace(g,h)},r:function(){return"D, d M Y H:i:s O".replace(g,h)},U:function(){return c/1e3|0}},this.date=function(a,b){return e=this,c=void 0===b?new Date:new Date(b instanceof Date?b:1e3*b),a.replace(g,h)},this.date(a,b)}function tb_init(a){$(a).click(function(){var a=this.title||this.name||null,b=this.href||this.alt,c=this.rel||!1;return tb_show(a,b,c),this.blur(),!1})}function tb_show(a,b,c){try{"undefined"==typeof document.body.style.maxHeight?($("body","html").css({height:"100%",width:"100%"}),$("html").css("overflow","hidden"),null===document.getElementById("TB_HideSelect")&&($("body").append("<iframe id='TB_HideSelect'></iframe><div id='TB_overlay'></div><div id='TB_window'></div>"),$("#TB_overlay").click(tb_remove))):null===document.getElementById("TB_overlay")&&($("body").append("<div id='TB_overlay'></div><div id='TB_window'></div>"),$("#TB_overlay").click(tb_remove)),$("#TB_overlay").addClass(tb_detectMacXFF()?"TB_overlayMacFFBGHack":"TB_overlayBG"),null===a&&(a=""),$("body").append("<div id='TB_load'><img src='"+imgLoader.src+"' /></div>"),$("#TB_load").show();var d;d=-1!==b.indexOf("?")?b.substr(0,b.indexOf("?")):b;var e=/\.jpg$|\.jpeg$|\.png$|\.gif$|\.bmp$/,f=d.toLowerCase().match(e);if(".jpg"==f||".jpeg"==f||".png"==f||".gif"==f||".bmp"==f){if(TB_PrevCaption="",TB_PrevURL="",TB_PrevHTML="",TB_NextCaption="",TB_NextURL="",TB_NextHTML="",TB_imageCount="",TB_FoundURL=!1,c)for(TB_TempArray=$("a[@rel="+c+"]").get(),TB_Counter=0;TB_Counter<TB_TempArray.length&&""===TB_NextHTML;TB_Counter++){{TB_TempArray[TB_Counter].href.toLowerCase().match(e)}TB_TempArray[TB_Counter].href!=b?TB_FoundURL?(TB_NextCaption=TB_TempArray[TB_Counter].title,TB_NextURL=TB_TempArray[TB_Counter].href,TB_NextHTML="<span id='TB_next'>&nbsp;&nbsp;<a href='#'>Next &gt;</a></span>"):(TB_PrevCaption=TB_TempArray[TB_Counter].title,TB_PrevURL=TB_TempArray[TB_Counter].href,TB_PrevHTML="<span id='TB_prev'>&nbsp;&nbsp;<a href='#'>&lt; Prev</a></span>"):(TB_FoundURL=!0,TB_imageCount="Image "+(TB_Counter+1)+" of "+TB_TempArray.length)}imgPreloader=new Image,imgPreloader.onload=function(){function d(){return $(document).unbind("click",d)&&$(document).unbind("click",d),$("#TB_window").remove(),$("body").append("<div id='TB_window'></div>"),tb_show(TB_PrevCaption,TB_PrevURL,c),!1}function e(){return $("#TB_window").remove(),$("body").append("<div id='TB_window'></div>"),tb_show(TB_NextCaption,TB_NextURL,c),!1}imgPreloader.onload=null;var f=tb_getPageSize(),g=f[0]-150,h=f[1]-150,i=imgPreloader.width,j=imgPreloader.height;i>g?(j*=g/i,i=g,j>h&&(i*=h/j,j=h)):j>h&&(i*=h/j,j=h,i>g&&(j*=g/i,i=g)),TB_WIDTH=i+30,TB_HEIGHT=j+60,$("#TB_window").append("<a href='' id='TB_ImageOff' title='Close'><img id='TB_Image' src='"+b+"' width='"+i+"' height='"+j+"' alt='"+a+"'/></a><div id='TB_caption'>"+a+"<div id='TB_secondLine'>"+TB_imageCount+TB_PrevHTML+TB_NextHTML+"</div></div><div id='TB_closeWindow'><a href='#' id='TB_closeWindowButton' title='Close'>X</a></div>"),$("#TB_closeWindowButton").click(tb_remove),""!==TB_PrevHTML&&$("#TB_prev").click(d),""!==TB_NextHTML&&$("#TB_next").click(e),document.onkeydown=function(a){keycode=null==a?event.keyCode:a.which,27==keycode?tb_remove():190==keycode?""!=TB_NextHTML&&(document.onkeydown="",e()):188==keycode&&""!=TB_PrevHTML&&(document.onkeydown="",d())},tb_position(),$("#TB_load").remove(),$("#TB_ImageOff").click(tb_remove),$("#TB_window").css({display:"block"})},imgPreloader.src=b}else{var g=tb_parseUrl(b),h=get_dimensions();TB_WIDTH=1*g.width+30||.6*h.width,TB_HEIGHT=1*g.height+40||.85*h.height,ajaxContentW=TB_WIDTH-30,ajaxContentH=TB_HEIGHT-45,-1!=b.indexOf("TB_iframe")?(urlNoQuery=b.split("TB_"),$("#TB_iframeContent").remove(),"true"!=g.modal?$("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+a+"</div><div id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton' title='Close'>X</a></div></div><iframe frameborder='0' hspace='0' src='"+urlNoQuery[0]+"' id='TB_iframeContent' name='TB_iframeContent"+Math.round(1e3*Math.random())+"' onload='tb_showIframe()' style='width:"+(ajaxContentW+29)+"px;height:"+(ajaxContentH+17)+"px;' > </iframe>"):($("#TB_overlay").unbind(),$("#TB_window").append("<iframe frameborder='0' hspace='0' src='"+urlNoQuery[0]+"' id='TB_iframeContent' name='TB_iframeContent"+Math.round(1e3*Math.random())+"' onload='tb_showIframe()' style='width:"+(ajaxContentW+29)+"px;height:"+(ajaxContentH+17)+"px;'> </iframe>"))):"block"!=$("#TB_window").css("display")?"true"!=g.modal?$("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+a+"</div><div id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton'>X</a></div></div><div id='TB_ajaxContent' style='width:"+ajaxContentW+"px;height:"+ajaxContentH+"px'></div>"):($("#TB_overlay").unbind(),$("#TB_window").append("<div id='TB_ajaxContent' class='TB_modal' style='width:"+ajaxContentW+"px;height:"+ajaxContentH+"px;'></div>")):($("#TB_ajaxContent")[0].style.width=ajaxContentW+"px",$("#TB_ajaxContent")[0].style.height=ajaxContentH+"px",$("#TB_ajaxContent")[0].scrollTop=0,$("#TB_ajaxWindowTitle").html(a)),$("#TB_closeWindowButton").click(tb_remove),-1!=b.indexOf("TB_inline")?($("#TB_ajaxContent").append($("#"+g.inlineId).children()),$("#TB_window").unload(function(){$("#"+g.inlineId).append($("#TB_ajaxContent").children())}),tb_position(),$("#TB_load").remove(),$("#TB_window").css({display:"block"})):-1!=b.indexOf("TB_iframe")?(tb_position(),$.browser.safari&&($("#TB_load").remove(),$("#TB_window").css({display:"block"}))):$("#TB_ajaxContent").load(b+="/random:"+(new Date).getTime(),function(){tb_position(),$("#TB_load").remove(),tb_init("#TB_ajaxContent a.thickbox"),$("#TB_window").css({display:"block"})})}g.modal||(document.onkeyup=function(a){keycode=null==a?event.keyCode:a.which,27==keycode&&tb_remove()})}catch(i){}}function tb_showIframe(){$("#TB_load").remove(),$("#TB_window").css({display:"block"})}function tb_remove(){return $("#TB_imageOff").unbind("click"),$("#TB_closeWindowButton").unbind("click"),$("#TB_window").fadeOut("fast",function(){$("#TB_window,#TB_overlay,#TB_HideSelect").trigger("unload").unbind().remove()}),$("#TB_load").remove(),"undefined"==typeof document.body.style.maxHeight&&($("body","html").css({height:"auto",width:"auto"}),$("html").css("overflow","")),document.onkeydown="",document.onkeyup="",!1}function tb_position(){$("#TB_window").css({marginLeft:"-"+parseInt(TB_WIDTH/2,10)+"px",width:TB_WIDTH+"px"}),jQuery.browser.msie&&jQuery.browser.version<7||$("#TB_window").css({marginTop:"-"+parseInt(TB_HEIGHT/2,10)+"px"})}function tb_parseQuery(a){var b={};if(!a)return b;for(var c=a.split(/[;&]/),d=0;d<c.length;d++){var e=c[d].split("=");if(e&&2==e.length){var f=unescape(e[0]),g=unescape(e[1]);g=g.replace(/\+/g," "),b[f]=g}}return b}function tb_parseUrl(a){var b={};if(!a)return b;var c=a.match(/[a-z 0-9~%.:_\-]+:[a-z 0-9~%.:_\-]+/gi);if(null==c)return b;for(var d=0;d<c.length;d++){var e=c[d].split(":");if(e&&2==e.length){var f=unescape(e[0]),g=unescape(e[1]);g=g.replace(/\+/g," "),b[f]=g}}return b}function tb_getPageSize(){var a=document.documentElement,b=window.innerWidth||self.innerWidth||a&&a.clientWidth||document.body.clientWidth,c=window.innerHeight||self.innerHeight||a&&a.clientHeight||document.body.clientHeight;return arrayPageSize=[b,c],arrayPageSize}function tb_detectMacXFF(){var a=navigator.userAgent.toLowerCase();return-1!=a.indexOf("mac")&&-1!=a.indexOf("firefox")?!0:void 0}!function(a,b){function c(a){var b=oa[a]={};return $.each(a.split(ba),function(a,c){b[c]=!0}),b}function d(a,c,d){if(d===b&&1===a.nodeType){var e="data-"+c.replace(qa,"-$1").toLowerCase();if(d=a.getAttribute(e),"string"==typeof d){try{d="true"===d?!0:"false"===d?!1:"null"===d?null:+d+""===d?+d:pa.test(d)?$.parseJSON(d):d}catch(f){}$.data(a,c,d)}else d=b}return d}function e(a){var b;for(b in a)if(("data"!==b||!$.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function f(){return!1}function g(){return!0}function h(a){return!a||!a.parentNode||11===a.parentNode.nodeType}function i(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}function j(a,b,c){if(b=b||0,$.isFunction(b))return $.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return $.grep(a,function(a){return a===b===c});if("string"==typeof b){var d=$.grep(a,function(a){return 1===a.nodeType});if(Ka.test(b))return $.filter(b,d,!c);b=$.filter(b,d)}return $.grep(a,function(a){return $.inArray(a,b)>=0===c})}function k(a){var b=Na.split("|"),c=a.createDocumentFragment();if(c.createElement)for(;b.length;)c.createElement(b.pop());return c}function l(a,b){return a.getElementsByTagName(b)[0]||a.appendChild(a.ownerDocument.createElement(b))}function m(a,b){if(1===b.nodeType&&$.hasData(a)){var c,d,e,f=$._data(a),g=$._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)$.event.add(b,c,h[c][d])}g.data&&(g.data=$.extend({},g.data))}}function n(a,b){var c;1===b.nodeType&&(b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase(),"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),$.support.html5Clone&&a.innerHTML&&!$.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&Xa.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.selected=a.defaultSelected:"input"===c||"textarea"===c?b.defaultValue=a.defaultValue:"script"===c&&b.text!==a.text&&(b.text=a.text),b.removeAttribute($.expando))}function o(a){return"undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName("*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll("*"):[]}function p(a){Xa.test(a.type)&&(a.defaultChecked=a.checked)}function q(a,b){if(b in a)return b;for(var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=rb.length;e--;)if(b=rb[e]+c,b in a)return b;return d}function r(a,b){return a=b||a,"none"===$.css(a,"display")||!$.contains(a.ownerDocument,a)}function s(a,b){for(var c,d,e=[],f=0,g=a.length;g>f;f++)c=a[f],c.style&&(e[f]=$._data(c,"olddisplay"),b?(e[f]||"none"!==c.style.display||(c.style.display=""),""===c.style.display&&r(c)&&(e[f]=$._data(c,"olddisplay",w(c.nodeName)))):(d=cb(c,"display"),e[f]||"none"===d||$._data(c,"olddisplay",d)));for(f=0;g>f;f++)c=a[f],c.style&&(b&&"none"!==c.style.display&&""!==c.style.display||(c.style.display=b?e[f]||"":"none"));return a}function t(a,b,c){var d=kb.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function u(a,b,c,d){for(var e=c===(d?"border":"content")?4:"width"===b?1:0,f=0;4>e;e+=2)"margin"===c&&(f+=$.css(a,c+qb[e],!0)),d?("content"===c&&(f-=parseFloat(cb(a,"padding"+qb[e]))||0),"margin"!==c&&(f-=parseFloat(cb(a,"border"+qb[e]+"Width"))||0)):(f+=parseFloat(cb(a,"padding"+qb[e]))||0,"padding"!==c&&(f+=parseFloat(cb(a,"border"+qb[e]+"Width"))||0));return f}function v(a,b,c){var d="width"===b?a.offsetWidth:a.offsetHeight,e=!0,f=$.support.boxSizing&&"border-box"===$.css(a,"boxSizing");if(0>=d||null==d){if(d=cb(a,b),(0>d||null==d)&&(d=a.style[b]),lb.test(d))return d;e=f&&($.support.boxSizingReliable||d===a.style[b]),d=parseFloat(d)||0}return d+u(a,b,c||(f?"border":"content"),e)+"px"}function w(a){if(nb[a])return nb[a];var b=$("<"+a+">").appendTo(P.body),c=b.css("display");return b.remove(),("none"===c||""===c)&&(db=P.body.appendChild(db||$.extend(P.createElement("iframe"),{frameBorder:0,width:0,height:0})),eb&&db.createElement||(eb=(db.contentWindow||db.contentDocument).document,eb.write("<!doctype html><html><body>"),eb.close()),b=eb.body.appendChild(eb.createElement(a)),c=cb(b,"display"),P.body.removeChild(db)),nb[a]=c,c}function x(a,b,c,d){var e;if($.isArray(b))$.each(b,function(b,e){c||ub.test(a)?d(a,e):x(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==$.type(b))d(a,b);else for(e in b)x(a+"["+e+"]",b[e],c,d)}function y(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e,f,g=b.toLowerCase().split(ba),h=0,i=g.length;if($.isFunction(c))for(;i>h;h++)d=g[h],f=/^\+/.test(d),f&&(d=d.substr(1)||"*"),e=a[d]=a[d]||[],e[f?"unshift":"push"](c)}}function z(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;for(var h,i=a[f],j=0,k=i?i.length:0,l=a===Kb;k>j&&(l||!h);j++)h=i[j](c,d,e),"string"==typeof h&&(!l||g[h]?h=b:(c.dataTypes.unshift(h),h=z(a,c,d,e,h,g)));return!l&&h||g["*"]||(h=z(a,c,d,e,"*",g)),h}function A(a,c){var d,e,f=$.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((f[d]?a:e||(e={}))[d]=c[d]);e&&$.extend(!0,a,e)}function B(a,c,d){var e,f,g,h,i=a.contents,j=a.dataTypes,k=a.responseFields;for(f in k)f in d&&(c[k[f]]=d[f]);for(;"*"===j[0];)j.shift(),e===b&&(e=a.mimeType||c.getResponseHeader("content-type"));if(e)for(f in i)if(i[f]&&i[f].test(e)){j.unshift(f);break}if(j[0]in d)g=j[0];else{for(f in d){if(!j[0]||a.converters[f+" "+j[0]]){g=f;break}h||(h=f)}g=g||h}return g?(g!==j[0]&&j.unshift(g),d[g]):void 0}function C(a,b){var c,d,e,f,g=a.dataTypes.slice(),h=g[0],i={},j=0;if(a.dataFilter&&(b=a.dataFilter(b,a.dataType)),g[1])for(c in a.converters)i[c.toLowerCase()]=a.converters[c];for(;e=g[++j];)if("*"!==e){if("*"!==h&&h!==e){if(c=i[h+" "+e]||i["* "+e],!c)for(d in i)if(f=d.split(" "),f[1]===e&&(c=i[h+" "+f[0]]||i["* "+f[0]])){c===!0?c=i[d]:i[d]!==!0&&(e=f[0],g.splice(j--,0,e));break}if(c!==!0)if(c&&a["throws"])b=c(b);else try{b=c(b)}catch(k){return{state:"parsererror",error:c?k:"No conversion from "+h+" to "+e}}}h=e}return{state:"success",data:b}}function D(){try{return new a.XMLHttpRequest}catch(b){}}function E(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function F(){return setTimeout(function(){Vb=b},0),Vb=$.now()}function G(a,b){$.each(b,function(b,c){for(var d=(_b[b]||[]).concat(_b["*"]),e=0,f=d.length;f>e;e++)if(d[e].call(a,b,c))return})}function H(a,b,c){var d,e=0,f=$b.length,g=$.Deferred().always(function(){delete h.elem}),h=function(){for(var b=Vb||F(),c=Math.max(0,i.startTime+i.duration-b),d=c/i.duration||0,e=1-d,f=0,h=i.tweens.length;h>f;f++)i.tweens[f].run(e);return g.notifyWith(a,[i,e,c]),1>e&&h?c:(g.resolveWith(a,[i]),!1)},i=g.promise({elem:a,props:$.extend({},b),opts:$.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:Vb||F(),duration:c.duration,tweens:[],createTween:function(b,c){var d=$.Tween(a,i.opts,b,c,i.opts.specialEasing[b]||i.opts.easing);return i.tweens.push(d),d},stop:function(b){for(var c=0,d=b?i.tweens.length:0;d>c;c++)i.tweens[c].run(1);return b?g.resolveWith(a,[i,b]):g.rejectWith(a,[i,b]),this}}),j=i.props;for(I(j,i.opts.specialEasing);f>e;e++)if(d=$b[e].call(i,a,j,i.opts))return d;return G(i,j),$.isFunction(i.opts.start)&&i.opts.start.call(a,i),$.fx.timer($.extend(h,{anim:i,queue:i.opts.queue,elem:a})),i.progress(i.opts.progress).done(i.opts.done,i.opts.complete).fail(i.opts.fail).always(i.opts.always)}function I(a,b){var c,d,e,f,g;for(c in a)if(d=$.camelCase(c),e=b[d],f=a[c],$.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=$.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function J(a,b,c){var d,e,f,g,h,i,j,k,l,m=this,n=a.style,o={},p=[],q=a.nodeType&&r(a);c.queue||(k=$._queueHooks(a,"fx"),null==k.unqueued&&(k.unqueued=0,l=k.empty.fire,k.empty.fire=function(){k.unqueued||l()}),k.unqueued++,m.always(function(){m.always(function(){k.unqueued--,$.queue(a,"fx").length||k.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[n.overflow,n.overflowX,n.overflowY],"inline"===$.css(a,"display")&&"none"===$.css(a,"float")&&($.support.inlineBlockNeedsLayout&&"inline"!==w(a.nodeName)?n.zoom=1:n.display="inline-block")),c.overflow&&(n.overflow="hidden",$.support.shrinkWrapBlocks||m.done(function(){n.overflow=c.overflow[0],n.overflowX=c.overflow[1],n.overflowY=c.overflow[2]}));for(d in b)if(f=b[d],Xb.exec(f)){if(delete b[d],i=i||"toggle"===f,f===(q?"hide":"show"))continue;p.push(d)}if(g=p.length){h=$._data(a,"fxshow")||$._data(a,"fxshow",{}),"hidden"in h&&(q=h.hidden),i&&(h.hidden=!q),q?$(a).show():m.done(function(){$(a).hide()}),m.done(function(){var b;$.removeData(a,"fxshow",!0);for(b in o)$.style(a,b,o[b])});for(d=0;g>d;d++)e=p[d],j=m.createTween(e,q?h[e]:0),o[e]=h[e]||$.style(a,e),e in h||(h[e]=j.start,q&&(j.end=j.start,j.start="width"===e||"height"===e?1:0))}}function K(a,b,c,d,e){return new K.prototype.init(a,b,c,d,e)}function L(a,b){var c,d={height:a},e=0;for(b=b?1:0;4>e;e+=2-b)c=qb[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function M(a){return $.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}var N,O,P=a.document,Q=a.location,R=a.navigator,S=a.jQuery,T=a.$,U=Array.prototype.push,V=Array.prototype.slice,W=Array.prototype.indexOf,X=Object.prototype.toString,Y=Object.prototype.hasOwnProperty,Z=String.prototype.trim,$=function(a,b){return new $.fn.init(a,b,N)},_=/[\-+]?(?:\d*\.|)\d+(?:[eE][\-+]?\d+|)/.source,aa=/\S/,ba=/\s+/,ca=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,da=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,ea=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,fa=/^[\],:{}\s]*$/,ga=/(?:^|:|,)(?:\s*\[)+/g,ha=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,ia=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,ja=/^-ms-/,ka=/-([\da-z])/gi,la=function(a,b){return(b+"").toUpperCase()},ma=function(){P.addEventListener?(P.removeEventListener("DOMContentLoaded",ma,!1),$.ready()):"complete"===P.readyState&&(P.detachEvent("onreadystatechange",ma),$.ready())},na={};$.fn=$.prototype={constructor:$,init:function(a,c,d){var e,f,g;if(!a)return this;if(a.nodeType)return this.context=this[0]=a,this.length=1,this;if("string"==typeof a){if(e="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:da.exec(a),!e||!e[1]&&c)return!c||c.jquery?(c||d).find(a):this.constructor(c).find(a);if(e[1])return c=c instanceof $?c[0]:c,g=c&&c.nodeType?c.ownerDocument||c:P,a=$.parseHTML(e[1],g,!0),ea.test(e[1])&&$.isPlainObject(c)&&this.attr.call(a,c,!0),$.merge(this,a);if(f=P.getElementById(e[2]),f&&f.parentNode){if(f.id!==e[2])return d.find(a);this.length=1,this[0]=f}return this.context=P,this.selector=a,this}return $.isFunction(a)?d.ready(a):(a.selector!==b&&(this.selector=a.selector,this.context=a.context),$.makeArray(a,this))},selector:"",jquery:"1.8.3",length:0,size:function(){return this.length},toArray:function(){return V.call(this)},get:function(a){return null==a?this.toArray():0>a?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=$.merge(this.constructor(),a);return d.prevObject=this,d.context=this.context,"find"===b?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")"),d},each:function(a,b){return $.each(this,a,b)},ready:function(a){return $.ready.promise().done(a),this},eq:function(a){return a=+a,-1===a?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(V.apply(this,arguments),"slice",V.call(arguments).join(","))},map:function(a){return this.pushStack($.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:U,sort:[].sort,splice:[].splice},$.fn.init.prototype=$.fn,$.extend=$.fn.extend=function(){var a,c,d,e,f,g,h=arguments[0]||{},i=1,j=arguments.length,k=!1;for("boolean"==typeof h&&(k=h,h=arguments[1]||{},i=2),"object"==typeof h||$.isFunction(h)||(h={}),j===i&&(h=this,--i);j>i;i++)if(null!=(a=arguments[i]))for(c in a)d=h[c],e=a[c],h!==e&&(k&&e&&($.isPlainObject(e)||(f=$.isArray(e)))?(f?(f=!1,g=d&&$.isArray(d)?d:[]):g=d&&$.isPlainObject(d)?d:{},h[c]=$.extend(k,g,e)):e!==b&&(h[c]=e));return h},$.extend({noConflict:function(b){return a.$===$&&(a.$=T),b&&a.jQuery===$&&(a.jQuery=S),$},isReady:!1,readyWait:1,holdReady:function(a){a?$.readyWait++:$.ready(!0)},ready:function(a){if(a===!0?!--$.readyWait:!$.isReady){if(!P.body)return setTimeout($.ready,1);$.isReady=!0,a!==!0&&--$.readyWait>0||(O.resolveWith(P,[$]),$.fn.trigger&&$(P).trigger("ready").off("ready"))}},isFunction:function(a){return"function"===$.type(a)},isArray:Array.isArray||function(a){return"array"===$.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return null==a?String(a):na[X.call(a)]||"object"},isPlainObject:function(a){if(!a||"object"!==$.type(a)||a.nodeType||$.isWindow(a))return!1;try{if(a.constructor&&!Y.call(a,"constructor")&&!Y.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||Y.call(a,d)},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},error:function(a){throw new Error(a)},parseHTML:function(a,b,c){var d;return a&&"string"==typeof a?("boolean"==typeof b&&(c=b,b=0),b=b||P,(d=ea.exec(a))?[b.createElement(d[1])]:(d=$.buildFragment([a],b,c?null:[]),$.merge([],(d.cacheable?$.clone(d.fragment):d.fragment).childNodes))):null},parseJSON:function(b){return b&&"string"==typeof b?(b=$.trim(b),a.JSON&&a.JSON.parse?a.JSON.parse(b):fa.test(b.replace(ha,"@").replace(ia,"]").replace(ga,""))?new Function("return "+b)():void $.error("Invalid JSON: "+b)):null},parseXML:function(c){var d,e;if(!c||"string"!=typeof c)return null;try{a.DOMParser?(e=new DOMParser,d=e.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(f){d=b}return d&&d.documentElement&&!d.getElementsByTagName("parsererror").length||$.error("Invalid XML: "+c),d},noop:function(){},globalEval:function(b){b&&aa.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(ja,"ms-").replace(ka,la)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,c,d){var e,f=0,g=a.length,h=g===b||$.isFunction(a);if(d)if(h){for(e in a)if(c.apply(a[e],d)===!1)break}else for(;g>f&&c.apply(a[f++],d)!==!1;);else if(h){for(e in a)if(c.call(a[e],e,a[e])===!1)break}else for(;g>f&&c.call(a[f],f,a[f++])!==!1;);return a},trim:Z&&!Z.call("\ufeff ")?function(a){return null==a?"":Z.call(a)}:function(a){return null==a?"":(a+"").replace(ca,"")},makeArray:function(a,b){var c,d=b||[];return null!=a&&(c=$.type(a),null==a.length||"string"===c||"function"===c||"regexp"===c||$.isWindow(a)?U.call(d,a):$.merge(d,a)),d},inArray:function(a,b,c){var d;if(b){if(W)return W.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=c.length,e=a.length,f=0;if("number"==typeof d)for(;d>f;f++)a[e++]=c[f];else for(;c[f]!==b;)a[e++]=c[f++];return a.length=e,a},grep:function(a,b,c){var d,e=[],f=0,g=a.length;for(c=!!c;g>f;f++)d=!!b(a[f],f),c!==d&&e.push(a[f]);return e},map:function(a,c,d){var e,f,g=[],h=0,i=a.length,j=a instanceof $||i!==b&&"number"==typeof i&&(i>0&&a[0]&&a[i-1]||0===i||$.isArray(a));if(j)for(;i>h;h++)e=c(a[h],h,d),null!=e&&(g[g.length]=e);else for(f in a)e=c(a[f],f,d),null!=e&&(g[g.length]=e);return g.concat.apply([],g)},guid:1,proxy:function(a,c){var d,e,f;return"string"==typeof c&&(d=a[c],c=a,a=d),$.isFunction(a)?(e=V.call(arguments,2),f=function(){return a.apply(c,e.concat(V.call(arguments)))},f.guid=a.guid=a.guid||$.guid++,f):b},access:function(a,c,d,e,f,g,h){var i,j=null==d,k=0,l=a.length;if(d&&"object"==typeof d){for(k in d)$.access(a,c,k,d[k],1,g,e);f=1}else if(e!==b){if(i=h===b&&$.isFunction(e),j&&(i?(i=c,c=function(a,b,c){return i.call($(a),c)}):(c.call(a,e),c=null)),c)for(;l>k;k++)c(a[k],d,i?e.call(a[k],k,c(a[k],d)):e,h);f=1}return f?a:j?c.call(a):l?c(a[0],d):g},now:function(){
 return(new Date).getTime()}}),$.ready.promise=function(b){if(!O)if(O=$.Deferred(),"complete"===P.readyState)setTimeout($.ready,1);else if(P.addEventListener)P.addEventListener("DOMContentLoaded",ma,!1),a.addEventListener("load",$.ready,!1);else{P.attachEvent("onreadystatechange",ma),a.attachEvent("onload",$.ready);var c=!1;try{c=null==a.frameElement&&P.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!$.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}$.ready()}}()}return O.promise(b)},$.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){na["[object "+b+"]"]=b.toLowerCase()}),N=$(P);var oa={};$.Callbacks=function(a){a="string"==typeof a?oa[a]||c(a):$.extend({},a);var d,e,f,g,h,i,j=[],k=!a.once&&[],l=function(b){for(d=a.memory&&b,e=!0,i=g||0,g=0,h=j.length,f=!0;j&&h>i;i++)if(j[i].apply(b[0],b[1])===!1&&a.stopOnFalse){d=!1;break}f=!1,j&&(k?k.length&&l(k.shift()):d?j=[]:m.disable())},m={add:function(){if(j){var b=j.length;!function c(b){$.each(b,function(b,d){var e=$.type(d);"function"===e?a.unique&&m.has(d)||j.push(d):d&&d.length&&"string"!==e&&c(d)})}(arguments),f?h=j.length:d&&(g=b,l(d))}return this},remove:function(){return j&&$.each(arguments,function(a,b){for(var c;(c=$.inArray(b,j,c))>-1;)j.splice(c,1),f&&(h>=c&&h--,i>=c&&i--)}),this},has:function(a){return $.inArray(a,j)>-1},empty:function(){return j=[],this},disable:function(){return j=k=d=b,this},disabled:function(){return!j},lock:function(){return k=b,d||m.disable(),this},locked:function(){return!k},fireWith:function(a,b){return b=b||[],b=[a,b.slice?b.slice():b],!j||e&&!k||(f?k.push(b):l(b)),this},fire:function(){return m.fireWith(this,arguments),this},fired:function(){return!!e}};return m},$.extend({Deferred:function(a){var b=[["resolve","done",$.Callbacks("once memory"),"resolved"],["reject","fail",$.Callbacks("once memory"),"rejected"],["notify","progress",$.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return $.Deferred(function(c){$.each(b,function(b,d){var f=d[0],g=a[b];e[d[1]]($.isFunction(g)?function(){var a=g.apply(this,arguments);a&&$.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f+"With"](this===e?c:this,[a])}:c[f])}),a=null}).promise()},promise:function(a){return null!=a?$.extend(a,d):d}},e={};return d.pipe=d.then,$.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=g.fire,e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b,c,d,e=0,f=V.call(arguments),g=f.length,h=1!==g||a&&$.isFunction(a.promise)?g:0,i=1===h?a:$.Deferred(),j=function(a,c,d){return function(e){c[a]=this,d[a]=arguments.length>1?V.call(arguments):e,d===b?i.notifyWith(c,d):--h||i.resolveWith(c,d)}};if(g>1)for(b=new Array(g),c=new Array(g),d=new Array(g);g>e;e++)f[e]&&$.isFunction(f[e].promise)?f[e].promise().done(j(e,d,f)).fail(i.reject).progress(j(e,c,b)):--h;return h||i.resolveWith(d,f),i.promise()}}),$.support=function(){var b,c,d,e,f,g,h,i,j,k,l,m=P.createElement("div");if(m.setAttribute("className","t"),m.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",c=m.getElementsByTagName("*"),d=m.getElementsByTagName("a")[0],!c||!d||!c.length)return{};e=P.createElement("select"),f=e.appendChild(P.createElement("option")),g=m.getElementsByTagName("input")[0],d.style.cssText="top:1px;float:left;opacity:.5",b={leadingWhitespace:3===m.firstChild.nodeType,tbody:!m.getElementsByTagName("tbody").length,htmlSerialize:!!m.getElementsByTagName("link").length,style:/top/.test(d.getAttribute("style")),hrefNormalized:"/a"===d.getAttribute("href"),opacity:/^0.5/.test(d.style.opacity),cssFloat:!!d.style.cssFloat,checkOn:"on"===g.value,optSelected:f.selected,getSetAttribute:"t"!==m.className,enctype:!!P.createElement("form").enctype,html5Clone:"<:nav></:nav>"!==P.createElement("nav").cloneNode(!0).outerHTML,boxModel:"CSS1Compat"===P.compatMode,submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},g.checked=!0,b.noCloneChecked=g.cloneNode(!0).checked,e.disabled=!0,b.optDisabled=!f.disabled;try{delete m.test}catch(n){b.deleteExpando=!1}if(!m.addEventListener&&m.attachEvent&&m.fireEvent&&(m.attachEvent("onclick",l=function(){b.noCloneEvent=!1}),m.cloneNode(!0).fireEvent("onclick"),m.detachEvent("onclick",l)),g=P.createElement("input"),g.value="t",g.setAttribute("type","radio"),b.radioValue="t"===g.value,g.setAttribute("checked","checked"),g.setAttribute("name","t"),m.appendChild(g),h=P.createDocumentFragment(),h.appendChild(m.lastChild),b.checkClone=h.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=g.checked,h.removeChild(g),h.appendChild(m),m.attachEvent)for(j in{submit:!0,change:!0,focusin:!0})i="on"+j,k=i in m,k||(m.setAttribute(i,"return;"),k="function"==typeof m[i]),b[j+"Bubbles"]=k;return $(function(){var c,d,e,f,g="padding:0;margin:0;border:0;display:block;overflow:hidden;",h=P.getElementsByTagName("body")[0];h&&(c=P.createElement("div"),c.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",h.insertBefore(c,h.firstChild),d=P.createElement("div"),c.appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",e=d.getElementsByTagName("td"),e[0].style.cssText="padding:0;margin:0;border:0;display:none",k=0===e[0].offsetHeight,e[0].style.display="",e[1].style.display="none",b.reliableHiddenOffsets=k&&0===e[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",b.boxSizing=4===d.offsetWidth,b.doesNotIncludeMarginInBodyOffset=1!==h.offsetTop,a.getComputedStyle&&(b.pixelPosition="1%"!==(a.getComputedStyle(d,null)||{}).top,b.boxSizingReliable="4px"===(a.getComputedStyle(d,null)||{width:"4px"}).width,f=P.createElement("div"),f.style.cssText=d.style.cssText=g,f.style.marginRight=f.style.width="0",d.style.width="1px",d.appendChild(f),b.reliableMarginRight=!parseFloat((a.getComputedStyle(f,null)||{}).marginRight)),"undefined"!=typeof d.style.zoom&&(d.innerHTML="",d.style.cssText=g+"width:1px;padding:1px;display:inline;zoom:1",b.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.style.overflow="visible",d.innerHTML="<div></div>",d.firstChild.style.width="5px",b.shrinkWrapBlocks=3!==d.offsetWidth,c.style.zoom=1),h.removeChild(c),c=d=e=f=null)}),h.removeChild(m),c=d=e=f=g=h=m=null,b}();var pa=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,qa=/([A-Z])/g;$.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+($.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){return a=a.nodeType?$.cache[a[$.expando]]:a[$.expando],!!a&&!e(a)},data:function(a,c,d,e){if($.acceptData(a)){var f,g,h=$.expando,i="string"==typeof c,j=a.nodeType,k=j?$.cache:a,l=j?a[h]:a[h]&&h;if(l&&k[l]&&(e||k[l].data)||!i||d!==b)return l||(j?a[h]=l=$.deletedIds.pop()||$.guid++:l=h),k[l]||(k[l]={},j||(k[l].toJSON=$.noop)),("object"==typeof c||"function"==typeof c)&&(e?k[l]=$.extend(k[l],c):k[l].data=$.extend(k[l].data,c)),f=k[l],e||(f.data||(f.data={}),f=f.data),d!==b&&(f[$.camelCase(c)]=d),i?(g=f[c],null==g&&(g=f[$.camelCase(c)])):g=f,g}},removeData:function(a,b,c){if($.acceptData(a)){var d,f,g,h=a.nodeType,i=h?$.cache:a,j=h?a[$.expando]:$.expando;if(i[j]){if(b&&(d=c?i[j]:i[j].data)){$.isArray(b)||(b in d?b=[b]:(b=$.camelCase(b),b=b in d?[b]:b.split(" ")));for(f=0,g=b.length;g>f;f++)delete d[b[f]];if(!(c?e:$.isEmptyObject)(d))return}(c||(delete i[j].data,e(i[j])))&&(h?$.cleanData([a],!0):$.support.deleteExpando||i!=i.window?delete i[j]:i[j]=null)}}},_data:function(a,b,c){return $.data(a,b,c,!0)},acceptData:function(a){var b=a.nodeName&&$.noData[a.nodeName.toLowerCase()];return!b||b!==!0&&a.getAttribute("classid")===b}}),$.fn.extend({data:function(a,c){var e,f,g,h,i,j=this[0],k=0,l=null;if(a===b){if(this.length&&(l=$.data(j),1===j.nodeType&&!$._data(j,"parsedAttrs"))){for(g=j.attributes,i=g.length;i>k;k++)h=g[k].name,h.indexOf("data-")||(h=$.camelCase(h.substring(5)),d(j,h,l[h]));$._data(j,"parsedAttrs",!0)}return l}return"object"==typeof a?this.each(function(){$.data(this,a)}):(e=a.split(".",2),e[1]=e[1]?"."+e[1]:"",f=e[1]+"!",$.access(this,function(c){return c===b?(l=this.triggerHandler("getData"+f,[e[0]]),l===b&&j&&(l=$.data(j,a),l=d(j,a,l)),l===b&&e[1]?this.data(e[0]):l):(e[1]=c,void this.each(function(){var b=$(this);b.triggerHandler("setData"+f,e),$.data(this,a,c),b.triggerHandler("changeData"+f,e)}))},null,c,arguments.length>1,null,!1))},removeData:function(a){return this.each(function(){$.removeData(this,a)})}}),$.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=$._data(a,b),c&&(!d||$.isArray(c)?d=$._data(a,b,$.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=$.queue(a,b),d=c.length,e=c.shift(),f=$._queueHooks(a,b),g=function(){$.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return $._data(a,c)||$._data(a,c,{empty:$.Callbacks("once memory").add(function(){$.removeData(a,b+"queue",!0),$.removeData(a,c,!0)})})}}),$.fn.extend({queue:function(a,c){var d=2;return"string"!=typeof a&&(c=a,a="fx",d--),arguments.length<d?$.queue(this[0],a):c===b?this:this.each(function(){var b=$.queue(this,a,c);$._queueHooks(this,a),"fx"===a&&"inprogress"!==b[0]&&$.dequeue(this,a)})},dequeue:function(a){return this.each(function(){$.dequeue(this,a)})},delay:function(a,b){return a=$.fx?$.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){var d,e=1,f=$.Deferred(),g=this,h=this.length,i=function(){--e||f.resolveWith(g,[g])};for("string"!=typeof a&&(c=a,a=b),a=a||"fx";h--;)d=$._data(g[h],a+"queueHooks"),d&&d.empty&&(e++,d.empty.add(i));return i(),f.promise(c)}});var ra,sa,ta,ua=/[\t\r\n]/g,va=/\r/g,wa=/^(?:button|input)$/i,xa=/^(?:button|input|object|select|textarea)$/i,ya=/^a(?:rea|)$/i,za=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,Aa=$.support.getSetAttribute;$.fn.extend({attr:function(a,b){return $.access(this,$.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){$.removeAttr(this,a)})},prop:function(a,b){return $.access(this,$.prop,a,b,arguments.length>1)},removeProp:function(a){return a=$.propFix[a]||a,this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,f,g,h;if($.isFunction(a))return this.each(function(b){$(this).addClass(a.call(this,b,this.className))});if(a&&"string"==typeof a)for(b=a.split(ba),c=0,d=this.length;d>c;c++)if(e=this[c],1===e.nodeType)if(e.className||1!==b.length){for(f=" "+e.className+" ",g=0,h=b.length;h>g;g++)f.indexOf(" "+b[g]+" ")<0&&(f+=b[g]+" ");e.className=$.trim(f)}else e.className=a;return this},removeClass:function(a){var c,d,e,f,g,h,i;if($.isFunction(a))return this.each(function(b){$(this).removeClass(a.call(this,b,this.className))});if(a&&"string"==typeof a||a===b)for(c=(a||"").split(ba),h=0,i=this.length;i>h;h++)if(e=this[h],1===e.nodeType&&e.className){for(d=(" "+e.className+" ").replace(ua," "),f=0,g=c.length;g>f;f++)for(;d.indexOf(" "+c[f]+" ")>=0;)d=d.replace(" "+c[f]+" "," ");e.className=a?$.trim(d):""}return this},toggleClass:function(a,b){var c=typeof a,d="boolean"==typeof b;return this.each($.isFunction(a)?function(c){$(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c)for(var e,f=0,g=$(this),h=b,i=a.split(ba);e=i[f++];)h=d?h:!g.hasClass(e),g[h?"addClass":"removeClass"](e);else("undefined"===c||"boolean"===c)&&(this.className&&$._data(this,"__className__",this.className),this.className=this.className||a===!1?"":$._data(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(ua," ").indexOf(b)>=0)return!0;return!1},val:function(a){var c,d,e,f=this[0];{if(arguments.length)return e=$.isFunction(a),this.each(function(d){var f,g=$(this);1===this.nodeType&&(f=e?a.call(this,d,g.val()):a,null==f?f="":"number"==typeof f?f+="":$.isArray(f)&&(f=$.map(f,function(a){return null==a?"":a+""})),c=$.valHooks[this.type]||$.valHooks[this.nodeName.toLowerCase()],c&&"set"in c&&c.set(this,f,"value")!==b||(this.value=f))});if(f)return c=$.valHooks[f.type]||$.valHooks[f.nodeName.toLowerCase()],c&&"get"in c&&(d=c.get(f,"value"))!==b?d:(d=f.value,"string"==typeof d?d.replace(va,""):null==d?"":d)}}}),$.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||($.support.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&$.nodeName(c.parentNode,"optgroup"))){if(b=$(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c=$.makeArray(b);return $(a).find("option").each(function(){this.selected=$.inArray($(this).val(),c)>=0}),c.length||(a.selectedIndex=-1),c}}},attrFn:{},attr:function(a,c,d,e){var f,g,h,i=a.nodeType;if(a&&3!==i&&8!==i&&2!==i)return e&&$.isFunction($.fn[c])?$(a)[c](d):"undefined"==typeof a.getAttribute?$.prop(a,c,d):(h=1!==i||!$.isXMLDoc(a),h&&(c=c.toLowerCase(),g=$.attrHooks[c]||(za.test(c)?sa:ra)),d!==b?null===d?void $.removeAttr(a,c):g&&"set"in g&&h&&(f=g.set(a,d,c))!==b?f:(a.setAttribute(c,d+""),d):g&&"get"in g&&h&&null!==(f=g.get(a,c))?f:(f=a.getAttribute(c),null===f?b:f))},removeAttr:function(a,b){var c,d,e,f,g=0;if(b&&1===a.nodeType)for(d=b.split(ba);g<d.length;g++)e=d[g],e&&(c=$.propFix[e]||e,f=za.test(e),f||$.attr(a,e,""),a.removeAttribute(Aa?e:c),f&&c in a&&(a[c]=!1))},attrHooks:{type:{set:function(a,b){if(wa.test(a.nodeName)&&a.parentNode)$.error("type property can't be changed");else if(!$.support.radioValue&&"radio"===b&&$.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}},value:{get:function(a,b){return ra&&$.nodeName(a,"button")?ra.get(a,b):b in a?a.value:null},set:function(a,b,c){return ra&&$.nodeName(a,"button")?ra.set(a,b,c):void(a.value=b)}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,f,g,h=a.nodeType;if(a&&3!==h&&8!==h&&2!==h)return g=1!==h||!$.isXMLDoc(a),g&&(c=$.propFix[c]||c,f=$.propHooks[c]),d!==b?f&&"set"in f&&(e=f.set(a,d,c))!==b?e:a[c]=d:f&&"get"in f&&null!==(e=f.get(a,c))?e:a[c]},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):xa.test(a.nodeName)||ya.test(a.nodeName)&&a.href?0:b}}}}),sa={get:function(a,c){var d,e=$.prop(a,c);return e===!0||"boolean"!=typeof e&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;return b===!1?$.removeAttr(a,c):(d=$.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase())),c}},Aa||(ta={name:!0,id:!0,coords:!0},ra=$.valHooks.button={get:function(a,c){var d;return d=a.getAttributeNode(c),d&&(ta[c]?""!==d.value:d.specified)?d.value:b},set:function(a,b,c){var d=a.getAttributeNode(c);return d||(d=P.createAttribute(c),a.setAttributeNode(d)),d.value=b+""}},$.each(["width","height"],function(a,b){$.attrHooks[b]=$.extend($.attrHooks[b],{set:function(a,c){return""===c?(a.setAttribute(b,"auto"),c):void 0}})}),$.attrHooks.contenteditable={get:ra.get,set:function(a,b,c){""===b&&(b="false"),ra.set(a,b,c)}}),$.support.hrefNormalized||$.each(["href","src","width","height"],function(a,c){$.attrHooks[c]=$.extend($.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return null===d?b:d}})}),$.support.style||($.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=b+""}}),$.support.optSelected||($.propHooks.selected=$.extend($.propHooks.selected,{get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}})),$.support.enctype||($.propFix.enctype="encoding"),$.support.checkOn||$.each(["radio","checkbox"],function(){$.valHooks[this]={get:function(a){return null===a.getAttribute("value")?"on":a.value}}}),$.each(["radio","checkbox"],function(){$.valHooks[this]=$.extend($.valHooks[this],{set:function(a,b){return $.isArray(b)?a.checked=$.inArray($(a).val(),b)>=0:void 0}})});var Ba=/^(?:textarea|input|select)$/i,Ca=/^([^\.]*|)(?:\.(.+)|)$/,Da=/(?:^|\s)hover(\.\S+|)\b/,Ea=/^key/,Fa=/^(?:mouse|contextmenu)|click/,Ga=/^(?:focusinfocus|focusoutblur)$/,Ha=function(a){return $.event.special.hover?a:a.replace(Da,"mouseenter$1 mouseleave$1")};$.event={add:function(a,c,d,e,f){var g,h,i,j,k,l,m,n,o,p,q;if(3!==a.nodeType&&8!==a.nodeType&&c&&d&&(g=$._data(a))){for(d.handler&&(o=d,d=o.handler,f=o.selector),d.guid||(d.guid=$.guid++),i=g.events,i||(g.events=i={}),h=g.handle,h||(g.handle=h=function(a){return"undefined"==typeof $||a&&$.event.triggered===a.type?b:$.event.dispatch.apply(h.elem,arguments)},h.elem=a),c=$.trim(Ha(c)).split(" "),j=0;j<c.length;j++)k=Ca.exec(c[j])||[],l=k[1],m=(k[2]||"").split(".").sort(),q=$.event.special[l]||{},l=(f?q.delegateType:q.bindType)||l,q=$.event.special[l]||{},n=$.extend({type:l,origType:k[1],data:e,handler:d,guid:d.guid,selector:f,needsContext:f&&$.expr.match.needsContext.test(f),namespace:m.join(".")},o),p=i[l],p||(p=i[l]=[],p.delegateCount=0,q.setup&&q.setup.call(a,e,m,h)!==!1||(a.addEventListener?a.addEventListener(l,h,!1):a.attachEvent&&a.attachEvent("on"+l,h))),q.add&&(q.add.call(a,n),n.handler.guid||(n.handler.guid=d.guid)),f?p.splice(p.delegateCount++,0,n):p.push(n),$.event.global[l]=!0;a=null}},global:{},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=$.hasData(a)&&$._data(a);if(q&&(m=q.events)){for(b=$.trim(Ha(b||"")).split(" "),f=0;f<b.length;f++)if(g=Ca.exec(b[f])||[],h=i=g[1],j=g[2],h){for(n=$.event.special[h]||{},h=(d?n.delegateType:n.bindType)||h,o=m[h]||[],k=o.length,j=j?new RegExp("(^|\\.)"+j.split(".").sort().join("\\.(?:.*\\.|)")+"(\\.|$)"):null,l=0;l<o.length;l++)p=o[l],!e&&i!==p.origType||c&&c.guid!==p.guid||j&&!j.test(p.namespace)||d&&d!==p.selector&&("**"!==d||!p.selector)||(o.splice(l--,1),p.selector&&o.delegateCount--,n.remove&&n.remove.call(a,p));0===o.length&&k!==o.length&&(n.teardown&&n.teardown.call(a,j,q.handle)!==!1||$.removeEvent(a,h,q.handle),delete m[h])}else for(h in m)$.event.remove(a,h+b[f],c,d,!0);$.isEmptyObject(m)&&(delete q.handle,$.removeData(a,"events",!0))}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,f){if(!e||3!==e.nodeType&&8!==e.nodeType){var g,h,i,j,k,l,m,n,o,p,q=c.type||c,r=[];if(!Ga.test(q+$.event.triggered)&&(q.indexOf("!")>=0&&(q=q.slice(0,-1),h=!0),q.indexOf(".")>=0&&(r=q.split("."),q=r.shift(),r.sort()),e&&!$.event.customEvent[q]||$.event.global[q]))if(c="object"==typeof c?c[$.expando]?c:new $.Event(q,c):new $.Event(q),c.type=q,c.isTrigger=!0,c.exclusive=h,c.namespace=r.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,l=q.indexOf(":")<0?"on"+q:"",e){if(c.result=b,c.target||(c.target=e),d=null!=d?$.makeArray(d):[],d.unshift(c),m=$.event.special[q]||{},!m.trigger||m.trigger.apply(e,d)!==!1){if(o=[[e,m.bindType||q]],!f&&!m.noBubble&&!$.isWindow(e)){for(p=m.delegateType||q,j=Ga.test(p+q)?e:e.parentNode,k=e;j;j=j.parentNode)o.push([j,p]),k=j;k===(e.ownerDocument||P)&&o.push([k.defaultView||k.parentWindow||a,p])}for(i=0;i<o.length&&!c.isPropagationStopped();i++)j=o[i][0],c.type=o[i][1],n=($._data(j,"events")||{})[c.type]&&$._data(j,"handle"),n&&n.apply(j,d),n=l&&j[l],n&&$.acceptData(j)&&n.apply&&n.apply(j,d)===!1&&c.preventDefault();return c.type=q,f||c.isDefaultPrevented()||m._default&&m._default.apply(e.ownerDocument,d)!==!1||"click"===q&&$.nodeName(e,"a")||!$.acceptData(e)||l&&e[q]&&("focus"!==q&&"blur"!==q||0!==c.target.offsetWidth)&&!$.isWindow(e)&&(k=e[l],k&&(e[l]=null),$.event.triggered=q,e[q](),$.event.triggered=b,k&&(e[l]=k)),c.result}}else{g=$.cache;for(i in g)g[i].events&&g[i].events[q]&&$.event.trigger(c,d,g[i].handle.elem,!0)}}},dispatch:function(c){c=$.event.fix(c||a.event);var d,e,f,g,h,i,j,k,l,m=($._data(this,"events")||{})[c.type]||[],n=m.delegateCount,o=V.call(arguments),p=!c.exclusive&&!c.namespace,q=$.event.special[c.type]||{},r=[];if(o[0]=c,c.delegateTarget=this,!q.preDispatch||q.preDispatch.call(this,c)!==!1){if(n&&(!c.button||"click"!==c.type))for(f=c.target;f!=this;f=f.parentNode||this)if(f.disabled!==!0||"click"!==c.type){for(h={},j=[],d=0;n>d;d++)k=m[d],l=k.selector,h[l]===b&&(h[l]=k.needsContext?$(l,this).index(f)>=0:$.find(l,this,null,[f]).length),h[l]&&j.push(k);j.length&&r.push({elem:f,matches:j})}for(m.length>n&&r.push({elem:this,matches:m.slice(n)}),d=0;d<r.length&&!c.isPropagationStopped();d++)for(i=r[d],c.currentTarget=i.elem,e=0;e<i.matches.length&&!c.isImmediatePropagationStopped();e++)k=i.matches[e],(p||!c.namespace&&!k.namespace||c.namespace_re&&c.namespace_re.test(k.namespace))&&(c.data=k.data,c.handleObj=k,g=(($.event.special[k.origType]||{}).handle||k.handler).apply(i.elem,o),g!==b&&(c.result=g,g===!1&&(c.preventDefault(),c.stopPropagation())));return q.postDispatch&&q.postDispatch.call(this,c),c.result}},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,c){var d,e,f,g=c.button,h=c.fromElement;return null==a.pageX&&null!=c.clientX&&(d=a.target.ownerDocument||P,e=d.documentElement,f=d.body,a.pageX=c.clientX+(e&&e.scrollLeft||f&&f.scrollLeft||0)-(e&&e.clientLeft||f&&f.clientLeft||0),a.pageY=c.clientY+(e&&e.scrollTop||f&&f.scrollTop||0)-(e&&e.clientTop||f&&f.clientTop||0)),!a.relatedTarget&&h&&(a.relatedTarget=h===a.target?c.toElement:h),a.which||g===b||(a.which=1&g?1:2&g?3:4&g?2:0),a}},fix:function(a){if(a[$.expando])return a;var b,c,d=a,e=$.event.fixHooks[a.type]||{},f=e.props?this.props.concat(e.props):this.props;for(a=$.Event(d),b=f.length;b;)c=f[--b],a[c]=d[c];return a.target||(a.target=d.srcElement||P),3===a.target.nodeType&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,e.filter?e.filter(a,d):a},special:{load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){$.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=$.extend(new $.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?$.event.trigger(e,null,b):$.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},$.event.handle=$.event.dispatch,$.removeEvent=P.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&("undefined"==typeof a[d]&&(a[d]=null),a.detachEvent(d,c))},$.Event=function(a,b){return this instanceof $.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?g:f):this.type=a,b&&$.extend(this,b),this.timeStamp=a&&a.timeStamp||$.now(),void(this[$.expando]=!0)):new $.Event(a,b)},$.Event.prototype={preventDefault:function(){this.isDefaultPrevented=g;var a=this.originalEvent;a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=g;var a=this.originalEvent;a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=g,this.stopPropagation()},isDefaultPrevented:f,isPropagationStopped:f,isImmediatePropagationStopped:f},$.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){$.event.special[a]={delegateType:b,bindType:b,handle:function(a){{var c,d=this,e=a.relatedTarget,f=a.handleObj;f.selector}return(!e||e!==d&&!$.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),$.support.submitBubbles||($.event.special.submit={setup:function(){return $.nodeName(this,"form")?!1:void $.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=$.nodeName(c,"input")||$.nodeName(c,"button")?c.form:b;d&&!$._data(d,"_submit_attached")&&($.event.add(d,"submit._submit",function(a){a._submit_bubble=!0}),$._data(d,"_submit_attached",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&$.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){return $.nodeName(this,"form")?!1:void $.event.remove(this,"._submit")}}),$.support.changeBubbles||($.event.special.change={setup:function(){return Ba.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&($.event.add(this,"propertychange._change",function(a){"checked"===a.originalEvent.propertyName&&(this._just_changed=!0)}),$.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),$.event.simulate("change",this,a,!0)})),!1):void $.event.add(this,"beforeactivate._change",function(a){var b=a.target;Ba.test(b.nodeName)&&!$._data(b,"_change_attached")&&($.event.add(b,"change._change",function(a){!this.parentNode||a.isSimulated||a.isTrigger||$.event.simulate("change",this.parentNode,a,!0)}),$._data(b,"_change_attached",!0))})},handle:function(a){var b=a.target;return this!==b||a.isSimulated||a.isTrigger||"radio"!==b.type&&"checkbox"!==b.type?a.handleObj.handler.apply(this,arguments):void 0},teardown:function(){return $.event.remove(this,"._change"),!Ba.test(this.nodeName)}}),$.support.focusinBubbles||$.each({focus:"focusin",blur:"focusout"},function(a,b){var c=0,d=function(a){$.event.simulate(b,a.target,$.event.fix(a),!0)};$.event.special[b]={setup:function(){0===c++&&P.addEventListener(a,d,!0)},teardown:function(){0===--c&&P.removeEventListener(a,d,!0)}}}),$.fn.extend({on:function(a,c,d,e,g){var h,i;if("object"==typeof a){"string"!=typeof c&&(d=d||c,c=b);for(i in a)this.on(i,c,d,a[i],g);return this}if(null==d&&null==e?(e=c,d=c=b):null==e&&("string"==typeof c?(e=d,d=b):(e=d,d=c,c=b)),e===!1)e=f;else if(!e)return this;return 1===g&&(h=e,e=function(a){return $().off(a),h.apply(this,arguments)},e.guid=h.guid||(h.guid=$.guid++)),this.each(function(){$.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,c,d){var e,g;if(a&&a.preventDefault&&a.handleObj)return e=a.handleObj,$(a.delegateTarget).off(e.namespace?e.origType+"."+e.namespace:e.origType,e.selector,e.handler),this;if("object"==typeof a){for(g in a)this.off(g,c,a[g]);return this}return(c===!1||"function"==typeof c)&&(d=c,c=b),d===!1&&(d=f),this.each(function(){$.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){return $(this.context).on(a,this.selector,b,c),this},die:function(a,b){return $(this.context).off(a,this.selector||"**",b),this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)},trigger:function(a,b){return this.each(function(){$.event.trigger(a,b,this)})},triggerHandler:function(a,b){return this[0]?$.event.trigger(a,b,this[0],!0):void 0},toggle:function(a){var b=arguments,c=a.guid||$.guid++,d=0,e=function(c){var e=($._data(this,"lastToggle"+a.guid)||0)%d;return $._data(this,"lastToggle"+a.guid,e+1),c.preventDefault(),b[e].apply(this,arguments)||!1};for(e.guid=c;d<b.length;)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),$.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){$.fn[b]=function(a,c){return null==c&&(c=a,a=null),arguments.length>0?this.on(b,null,a,c):this.trigger(b)},Ea.test(b)&&($.event.fixHooks[b]=$.event.keyHooks),Fa.test(b)&&($.event.fixHooks[b]=$.event.mouseHooks)}),function(a,b){function c(a,b,c,d){c=c||[],b=b||F;var e,f,g,h,i=b.nodeType;if(!a||"string"!=typeof a)return c;if(1!==i&&9!==i)return[];if(g=v(b),!g&&!d&&(e=ca.exec(a)))if(h=e[1]){if(9===i){if(f=b.getElementById(h),!f||!f.parentNode)return c;if(f.id===h)return c.push(f),c}else if(b.ownerDocument&&(f=b.ownerDocument.getElementById(h))&&w(b,f)&&f.id===h)return c.push(f),c}else{if(e[2])return K.apply(c,L.call(b.getElementsByTagName(a),0)),c;if((h=e[3])&&ma&&b.getElementsByClassName)return K.apply(c,L.call(b.getElementsByClassName(h),0)),c}return p(a.replace(Z,"$1"),b,c,d,g)}function d(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function e(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function f(a){return N(function(b){return b=+b,N(function(c,d){for(var e,f=a([],c.length,b),g=f.length;g--;)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function g(a,b,c){if(a===b)return c;for(var d=a.nextSibling;d;){if(d===b)return-1;d=d.nextSibling}return 1}function h(a,b){var d,e,f,g,h,i,j,k=Q[D][a+" "];if(k)return b?0:k.slice(0);for(h=a,i=[],j=t.preFilter;h;){(!d||(e=_.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),d=!1,(e=aa.exec(h))&&(f.push(d=new E(e.shift())),h=h.slice(d.length),d.type=e[0].replace(Z," "));for(g in t.filter)!(e=ha[g].exec(h))||j[g]&&!(e=j[g](e))||(f.push(d=new E(e.shift())),h=h.slice(d.length),d.type=g,d.matches=e);if(!d)break}return b?h.length:h?c.error(a):Q(a,i).slice(0)}function i(a,b,c){var d=b.dir,e=c&&"parentNode"===b.dir,f=I++;return b.first?function(b,c,f){for(;b=b[d];)if(e||1===b.nodeType)return a(b,c,f)}:function(b,c,g){if(g){for(;b=b[d];)if((e||1===b.nodeType)&&a(b,c,g))return b}else for(var h,i=H+" "+f+" ",j=i+r;b=b[d];)if(e||1===b.nodeType){if((h=b[D])===j)return b.sizset;if("string"==typeof h&&0===h.indexOf(i)){if(b.sizset)return b}else{if(b[D]=j,a(b,c,g))return b.sizset=!0,b;b.sizset=!1}}}}function j(a){return a.length>1?function(b,c,d){for(var e=a.length;e--;)if(!a[e](b,c,d))return!1;return!0}:a[0]}function k(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function l(a,b,c,d,e,f){return d&&!d[D]&&(d=l(d)),e&&!e[D]&&(e=l(e,f)),N(function(f,g,h,i){var j,l,m,n=[],p=[],q=g.length,r=f||o(b||"*",h.nodeType?[h]:h,[]),s=!a||!f&&b?r:k(r,n,a,h,i),t=c?e||(f?a:q||d)?[]:g:s;if(c&&c(s,t,h,i),d)for(j=k(t,p),d(j,[],h,i),l=j.length;l--;)(m=j[l])&&(t[p[l]]=!(s[p[l]]=m));if(f){if(e||a){if(e){for(j=[],l=t.length;l--;)(m=t[l])&&j.push(s[l]=m);e(null,t=[],j,i)}for(l=t.length;l--;)(m=t[l])&&(j=e?M.call(f,m):n[l])>-1&&(f[j]=!(g[j]=m))}}else t=k(t===g?t.splice(q,t.length):t),e?e(null,g,t,i):K.apply(g,t)})}function m(a){for(var b,c,d,e=a.length,f=t.relative[a[0].type],g=f||t.relative[" "],h=f?1:0,k=i(function(a){return a===b},g,!0),n=i(function(a){return M.call(b,a)>-1},g,!0),o=[function(a,c,d){return!f&&(d||c!==A)||((b=c).nodeType?k(a,c,d):n(a,c,d))}];e>h;h++)if(c=t.relative[a[h].type])o=[i(j(o),c)];else{
 if(c=t.filter[a[h].type].apply(null,a[h].matches),c[D]){for(d=++h;e>d&&!t.relative[a[d].type];d++);return l(h>1&&j(o),h>1&&a.slice(0,h-1).join("").replace(Z,"$1"),c,d>h&&m(a.slice(h,d)),e>d&&m(a=a.slice(d)),e>d&&a.join(""))}o.push(c)}return j(o)}function n(a,b){var d=b.length>0,e=a.length>0,f=function(g,h,i,j,l){var m,n,o,p=[],q=0,s="0",u=g&&[],v=null!=l,w=A,x=g||e&&t.find.TAG("*",l&&h.parentNode||h),y=H+=null==w?1:Math.E;for(v&&(A=h!==F&&h,r=f.el);null!=(m=x[s]);s++){if(e&&m){for(n=0;o=a[n];n++)if(o(m,h,i)){j.push(m);break}v&&(H=y,r=++f.el)}d&&((m=!o&&m)&&q--,g&&u.push(m))}if(q+=s,d&&s!==q){for(n=0;o=b[n];n++)o(u,p,h,i);if(g){if(q>0)for(;s--;)u[s]||p[s]||(p[s]=J.call(j));p=k(p)}K.apply(j,p),v&&!g&&p.length>0&&q+b.length>1&&c.uniqueSort(j)}return v&&(H=y,A=w),u};return f.el=0,d?N(f):f}function o(a,b,d){for(var e=0,f=b.length;f>e;e++)c(a,b[e],d);return d}function p(a,b,c,d,e){{var f,g,i,j,k,l=h(a);l.length}if(!d&&1===l.length){if(g=l[0]=l[0].slice(0),g.length>2&&"ID"===(i=g[0]).type&&9===b.nodeType&&!e&&t.relative[g[1].type]){if(b=t.find.ID(i.matches[0].replace(ga,""),b,e)[0],!b)return c;a=a.slice(g.shift().length)}for(f=ha.POS.test(a)?-1:g.length-1;f>=0&&(i=g[f],!t.relative[j=i.type]);f--)if((k=t.find[j])&&(d=k(i.matches[0].replace(ga,""),da.test(g[0].type)&&b.parentNode||b,e))){if(g.splice(f,1),a=d.length&&g.join(""),!a)return K.apply(c,L.call(d,0)),c;break}}return x(a,l)(d,b,e,c,da.test(a)),c}function q(){}var r,s,t,u,v,w,x,y,z,A,B=!0,C="undefined",D=("sizcache"+Math.random()).replace(".",""),E=String,F=a.document,G=F.documentElement,H=0,I=0,J=[].pop,K=[].push,L=[].slice,M=[].indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},N=function(a,b){return a[D]=null==b||b,a},O=function(){var a={},b=[];return N(function(c,d){return b.push(c)>t.cacheLength&&delete a[b.shift()],a[c+" "]=d},a)},P=O(),Q=O(),R=O(),S="[\\x20\\t\\r\\n\\f]",T="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",U=T.replace("w","w#"),V="([*^$|!~]?=)",W="\\["+S+"*("+T+")"+S+"*(?:"+V+S+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+U+")|)|)"+S+"*\\]",X=":("+T+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:"+W+")|[^:]|\\\\.)*|.*))\\)|)",Y=":(even|odd|eq|gt|lt|nth|first|last)(?:\\("+S+"*((?:-\\d)?\\d*)"+S+"*\\)|)(?=[^-]|$)",Z=new RegExp("^"+S+"+|((?:^|[^\\\\])(?:\\\\.)*)"+S+"+$","g"),_=new RegExp("^"+S+"*,"+S+"*"),aa=new RegExp("^"+S+"*([\\x20\\t\\r\\n\\f>+~])"+S+"*"),ba=new RegExp(X),ca=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,da=/[\x20\t\r\n\f]*[+~]/,ea=/h\d/i,fa=/input|select|textarea|button/i,ga=/\\(?!\\)/g,ha={ID:new RegExp("^#("+T+")"),CLASS:new RegExp("^\\.("+T+")"),NAME:new RegExp("^\\[name=['\"]?("+T+")['\"]?\\]"),TAG:new RegExp("^("+T.replace("w","w*")+")"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+X),POS:new RegExp(Y,"i"),CHILD:new RegExp("^:(only|nth|first|last)-child(?:\\("+S+"*(even|odd|(([+-]|)(\\d*)n|)"+S+"*(?:([+-]|)"+S+"*(\\d+)|))"+S+"*\\)|)","i"),needsContext:new RegExp("^"+S+"*[>+~]|"+Y,"i")},ia=function(a){var b=F.createElement("div");try{return a(b)}catch(c){return!1}finally{b=null}},ja=ia(function(a){return a.appendChild(F.createComment("")),!a.getElementsByTagName("*").length}),ka=ia(function(a){return a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!==C&&"#"===a.firstChild.getAttribute("href")}),la=ia(function(a){a.innerHTML="<select></select>";var b=typeof a.lastChild.getAttribute("multiple");return"boolean"!==b&&"string"!==b}),ma=ia(function(a){return a.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",a.getElementsByClassName&&a.getElementsByClassName("e").length?(a.lastChild.className="e",2===a.getElementsByClassName("e").length):!1}),na=ia(function(a){a.id=D+0,a.innerHTML="<a name='"+D+"'></a><div name='"+D+"'></div>",G.insertBefore(a,G.firstChild);var b=F.getElementsByName&&F.getElementsByName(D).length===2+F.getElementsByName(D+0).length;return s=!F.getElementById(D),G.removeChild(a),b});try{L.call(G.childNodes,0)[0].nodeType}catch(oa){L=function(a){for(var b,c=[];b=this[a];a++)c.push(b);return c}}c.matches=function(a,b){return c(a,null,null,b)},c.matchesSelector=function(a,b){return c(b,null,null,[a]).length>0},u=c.getText=function(a){var b,c="",d=0,e=a.nodeType;if(e){if(1===e||9===e||11===e){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=u(a)}else if(3===e||4===e)return a.nodeValue}else for(;b=a[d];d++)c+=u(b);return c},v=c.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},w=c.contains=G.contains?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!!(d&&1===d.nodeType&&c.contains&&c.contains(d))}:G.compareDocumentPosition?function(a,b){return b&&!!(16&a.compareDocumentPosition(b))}:function(a,b){for(;b=b.parentNode;)if(b===a)return!0;return!1},c.attr=function(a,b){var c,d=v(a);return d||(b=b.toLowerCase()),(c=t.attrHandle[b])?c(a):d||la?a.getAttribute(b):(c=a.getAttributeNode(b),c?"boolean"==typeof a[b]?a[b]?b:null:c.specified?c.value:null:null)},t=c.selectors={cacheLength:50,createPseudo:N,match:ha,attrHandle:ka?{}:{href:function(a){return a.getAttribute("href",2)},type:function(a){return a.getAttribute("type")}},find:{ID:s?function(a,b,c){if(typeof b.getElementById!==C&&!c){var d=b.getElementById(a);return d&&d.parentNode?[d]:[]}}:function(a,c,d){if(typeof c.getElementById!==C&&!d){var e=c.getElementById(a);return e?e.id===a||typeof e.getAttributeNode!==C&&e.getAttributeNode("id").value===a?[e]:b:[]}},TAG:ja?function(a,b){return typeof b.getElementsByTagName!==C?b.getElementsByTagName(a):void 0}:function(a,b){var c=b.getElementsByTagName(a);if("*"===a){for(var d,e=[],f=0;d=c[f];f++)1===d.nodeType&&e.push(d);return e}return c},NAME:na&&function(a,b){return typeof b.getElementsByName!==C?b.getElementsByName(name):void 0},CLASS:ma&&function(a,b,c){return typeof b.getElementsByClassName===C||c?void 0:b.getElementsByClassName(a)}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ga,""),a[3]=(a[4]||a[5]||"").replace(ga,""),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1]?(a[2]||c.error(a[0]),a[3]=+(a[3]?a[4]+(a[5]||1):2*("even"===a[2]||"odd"===a[2])),a[4]=+(a[6]+a[7]||"odd"===a[2])):a[2]&&c.error(a[0]),a},PSEUDO:function(a){var b,c;return ha.CHILD.test(a[0])?null:(a[3]?a[2]=a[3]:(b=a[4])&&(ba.test(b)&&(c=h(b,!0))&&(c=b.indexOf(")",b.length-c)-b.length)&&(b=b.slice(0,c),a[0]=a[0].slice(0,c)),a[2]=b),a.slice(0,3))}},filter:{ID:s?function(a){return a=a.replace(ga,""),function(b){return b.getAttribute("id")===a}}:function(a){return a=a.replace(ga,""),function(b){var c=typeof b.getAttributeNode!==C&&b.getAttributeNode("id");return c&&c.value===a}},TAG:function(a){return"*"===a?function(){return!0}:(a=a.replace(ga,"").toLowerCase(),function(b){return b.nodeName&&b.nodeName.toLowerCase()===a})},CLASS:function(a){var b=P[D][a+" "];return b||(b=new RegExp("(^|"+S+")"+a+"("+S+"|$)"))&&P(a,function(a){return b.test(a.className||typeof a.getAttribute!==C&&a.getAttribute("class")||"")})},ATTR:function(a,b,d){return function(e){var f=c.attr(e,a);return null==f?"!="===b:b?(f+="","="===b?f===d:"!="===b?f!==d:"^="===b?d&&0===f.indexOf(d):"*="===b?d&&f.indexOf(d)>-1:"$="===b?d&&f.substr(f.length-d.length)===d:"~="===b?(" "+f+" ").indexOf(d)>-1:"|="===b?f===d||f.substr(0,d.length+1)===d+"-":!1):!0}},CHILD:function(a,b,c,d){return"nth"===a?function(a){var b,e,f=a.parentNode;if(1===c&&0===d)return!0;if(f)for(e=0,b=f.firstChild;b&&(1!==b.nodeType||(e++,a!==b));b=b.nextSibling);return e-=d,e===c||e%c===0&&e/c>=0}:function(b){var c=b;switch(a){case"only":case"first":for(;c=c.previousSibling;)if(1===c.nodeType)return!1;if("first"===a)return!0;c=b;case"last":for(;c=c.nextSibling;)if(1===c.nodeType)return!1;return!0}}},PSEUDO:function(a,b){var d,e=t.pseudos[a]||t.setFilters[a.toLowerCase()]||c.error("unsupported pseudo: "+a);return e[D]?e(b):e.length>1?(d=[a,a,"",b],t.setFilters.hasOwnProperty(a.toLowerCase())?N(function(a,c){for(var d,f=e(a,b),g=f.length;g--;)d=M.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,d)}):e}},pseudos:{not:N(function(a){var b=[],c=[],d=x(a.replace(Z,"$1"));return d[D]?N(function(a,b,c,e){for(var f,g=d(a,null,e,[]),h=a.length;h--;)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:N(function(a){return function(b){return c(a,b).length>0}}),contains:N(function(a){return function(b){return(b.textContent||b.innerText||u(b)).indexOf(a)>-1}}),enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},parent:function(a){return!t.pseudos.empty(a)},empty:function(a){var b;for(a=a.firstChild;a;){if(a.nodeName>"@"||3===(b=a.nodeType)||4===b)return!1;a=a.nextSibling}return!0},header:function(a){return ea.test(a.nodeName)},text:function(a){var b,c;return"input"===a.nodeName.toLowerCase()&&"text"===(b=a.type)&&(null==(c=a.getAttribute("type"))||c.toLowerCase()===b)},radio:d("radio"),checkbox:d("checkbox"),file:d("file"),password:d("password"),image:d("image"),submit:e("submit"),reset:e("reset"),button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},input:function(a){return fa.test(a.nodeName)},focus:function(a){var b=a.ownerDocument;return a===b.activeElement&&(!b.hasFocus||b.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},active:function(a){return a===a.ownerDocument.activeElement},first:f(function(){return[0]}),last:f(function(a,b){return[b-1]}),eq:f(function(a,b,c){return[0>c?c+b:c]}),even:f(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:f(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:f(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:f(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},y=G.compareDocumentPosition?function(a,b){return a===b?(z=!0,0):(a.compareDocumentPosition&&b.compareDocumentPosition?4&a.compareDocumentPosition(b):a.compareDocumentPosition)?-1:1}:function(a,b){if(a===b)return z=!0,0;if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],h=a.parentNode,i=b.parentNode,j=h;if(h===i)return g(a,b);if(!h)return-1;if(!i)return 1;for(;j;)e.unshift(j),j=j.parentNode;for(j=i;j;)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;c>k&&d>k;k++)if(e[k]!==f[k])return g(e[k],f[k]);return k===c?g(a,f[k],-1):g(e[k],b,1)},[0,0].sort(y),B=!z,c.uniqueSort=function(a){var b,c=[],d=1,e=0;if(z=B,a.sort(y),z){for(;b=a[d];d++)b===a[d-1]&&(e=c.push(d));for(;e--;)a.splice(c[e],1)}return a},c.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},x=c.compile=function(a,b){var c,d=[],e=[],f=R[D][a+" "];if(!f){for(b||(b=h(a)),c=b.length;c--;)f=m(b[c]),f[D]?d.push(f):e.push(f);f=R(a,n(e,d))}return f},F.querySelectorAll&&!function(){var a,b=p,d=/'|\\/g,e=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,f=[":focus"],g=[":active"],i=G.matchesSelector||G.mozMatchesSelector||G.webkitMatchesSelector||G.oMatchesSelector||G.msMatchesSelector;ia(function(a){a.innerHTML="<select><option selected=''></option></select>",a.querySelectorAll("[selected]").length||f.push("\\["+S+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),a.querySelectorAll(":checked").length||f.push(":checked")}),ia(function(a){a.innerHTML="<p test=''></p>",a.querySelectorAll("[test^='']").length&&f.push("[*^$]="+S+"*(?:\"\"|'')"),a.innerHTML="<input type='hidden'/>",a.querySelectorAll(":enabled").length||f.push(":enabled",":disabled")}),f=new RegExp(f.join("|")),p=function(a,c,e,g,i){if(!g&&!i&&!f.test(a)){var j,k,l=!0,m=D,n=c,o=9===c.nodeType&&a;if(1===c.nodeType&&"object"!==c.nodeName.toLowerCase()){for(j=h(a),(l=c.getAttribute("id"))?m=l.replace(d,"\\$&"):c.setAttribute("id",m),m="[id='"+m+"'] ",k=j.length;k--;)j[k]=m+j[k].join("");n=da.test(a)&&c.parentNode||c,o=j.join(",")}if(o)try{return K.apply(e,L.call(n.querySelectorAll(o),0)),e}catch(p){}finally{l||c.removeAttribute("id")}}return b(a,c,e,g,i)},i&&(ia(function(b){a=i.call(b,"div");try{i.call(b,"[test!='']:sizzle"),g.push("!=",X)}catch(c){}}),g=new RegExp(g.join("|")),c.matchesSelector=function(b,d){if(d=d.replace(e,"='$1']"),!v(b)&&!g.test(d)&&!f.test(d))try{var h=i.call(b,d);if(h||a||b.document&&11!==b.document.nodeType)return h}catch(j){}return c(d,null,null,[b]).length>0})}(),t.pseudos.nth=t.pseudos.eq,t.filters=q.prototype=t.pseudos,t.setFilters=new q,c.attr=$.attr,$.find=c,$.expr=c.selectors,$.expr[":"]=$.expr.pseudos,$.unique=c.uniqueSort,$.text=c.getText,$.isXMLDoc=c.isXML,$.contains=c.contains}(a);var Ia=/Until$/,Ja=/^(?:parents|prev(?:Until|All))/,Ka=/^.[^:#\[\.,]*$/,La=$.expr.match.needsContext,Ma={children:!0,contents:!0,next:!0,prev:!0};$.fn.extend({find:function(a){var b,c,d,e,f,g,h=this;if("string"!=typeof a)return $(a).filter(function(){for(b=0,c=h.length;c>b;b++)if($.contains(h[b],this))return!0});for(g=this.pushStack("","find",a),b=0,c=this.length;c>b;b++)if(d=g.length,$.find(a,this[b],g),b>0)for(e=d;e<g.length;e++)for(f=0;d>f;f++)if(g[f]===g[e]){g.splice(e--,1);break}return g},has:function(a){var b,c=$(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if($.contains(this,c[b]))return!0})},not:function(a){return this.pushStack(j(this,a,!1),"not",a)},filter:function(a){return this.pushStack(j(this,a,!0),"filter",a)},is:function(a){return!!a&&("string"==typeof a?La.test(a)?$(a,this.context).index(this[0])>=0:$.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=La.test(a)||"string"!=typeof a?$(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c.ownerDocument&&c!==b&&11!==c.nodeType;){if(g?g.index(c)>-1:$.find.matchesSelector(c,a)){f.push(c);break}c=c.parentNode}return f=f.length>1?$.unique(f):f,this.pushStack(f,"closest",a)},index:function(a){return a?"string"==typeof a?$.inArray(this[0],$(a)):$.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(a,b){var c="string"==typeof a?$(a,b):$.makeArray(a&&a.nodeType?[a]:a),d=$.merge(this.get(),c);return this.pushStack(h(c[0])||h(d[0])?d:$.unique(d))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}}),$.fn.andSelf=$.fn.addBack,$.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return $.dir(a,"parentNode")},parentsUntil:function(a,b,c){return $.dir(a,"parentNode",c)},next:function(a){return i(a,"nextSibling")},prev:function(a){return i(a,"previousSibling")},nextAll:function(a){return $.dir(a,"nextSibling")},prevAll:function(a){return $.dir(a,"previousSibling")},nextUntil:function(a,b,c){return $.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return $.dir(a,"previousSibling",c)},siblings:function(a){return $.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return $.sibling(a.firstChild)},contents:function(a){return $.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:$.merge([],a.childNodes)}},function(a,b){$.fn[a]=function(c,d){var e=$.map(this,b,c);return Ia.test(a)||(d=c),d&&"string"==typeof d&&(e=$.filter(d,e)),e=this.length>1&&!Ma[a]?$.unique(e):e,this.length>1&&Ja.test(a)&&(e=e.reverse()),this.pushStack(e,a,V.call(arguments).join(","))}}),$.extend({filter:function(a,b,c){return c&&(a=":not("+a+")"),1===b.length?$.find.matchesSelector(b[0],a)?[b[0]]:[]:$.find.matches(a,b)},dir:function(a,c,d){for(var e=[],f=a[c];f&&9!==f.nodeType&&(d===b||1!==f.nodeType||!$(f).is(d));)1===f.nodeType&&e.push(f),f=f[c];return e},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}});var Na="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",Oa=/ jQuery\d+="(?:null|\d+)"/g,Pa=/^\s+/,Qa=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,Ra=/<([\w:]+)/,Sa=/<tbody/i,Ta=/<|&#?\w+;/,Ua=/<(?:script|style|link)/i,Va=/<(?:script|object|embed|option|style)/i,Wa=new RegExp("<(?:"+Na+")[\\s/>]","i"),Xa=/^(?:checkbox|radio)$/,Ya=/checked\s*(?:[^=]|=\s*.checked.)/i,Za=/\/(java|ecma)script/i,$a=/^\s*<!(?:\[CDATA\[|\-\-)|[\]\-]{2}>\s*$/g,_a={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},ab=k(P),bb=ab.appendChild(P.createElement("div"));_a.optgroup=_a.option,_a.tbody=_a.tfoot=_a.colgroup=_a.caption=_a.thead,_a.th=_a.td,$.support.htmlSerialize||(_a._default=[1,"X<div>","</div>"]),$.fn.extend({text:function(a){return $.access(this,function(a){return a===b?$.text(this):this.empty().append((this[0]&&this[0].ownerDocument||P).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if($.isFunction(a))return this.each(function(b){$(this).wrapAll(a.call(this,b))});if(this[0]){var b=$(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){for(var a=this;a.firstChild&&1===a.firstChild.nodeType;)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return this.each($.isFunction(a)?function(b){$(this).wrapInner(a.call(this,b))}:function(){var b=$(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=$.isFunction(a);return this.each(function(c){$(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){$.nodeName(this,"body")||$(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){(1===this.nodeType||11===this.nodeType)&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){(1===this.nodeType||11===this.nodeType)&&this.insertBefore(a,this.firstChild)})},before:function(){if(!h(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=$.clean(arguments);return this.pushStack($.merge(a,this),"before",this.selector)}},after:function(){if(!h(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=$.clean(arguments);return this.pushStack($.merge(this,a),"after",this.selector)}},remove:function(a,b){for(var c,d=0;null!=(c=this[d]);d++)(!a||$.filter(a,[c]).length)&&(b||1!==c.nodeType||($.cleanData(c.getElementsByTagName("*")),$.cleanData([c])),c.parentNode&&c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)for(1===a.nodeType&&$.cleanData(a.getElementsByTagName("*"));a.firstChild;)a.removeChild(a.firstChild);return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return $.clone(this,a,b)})},html:function(a){return $.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return 1===c.nodeType?c.innerHTML.replace(Oa,""):b;if(!("string"!=typeof a||Ua.test(a)||!$.support.htmlSerialize&&Wa.test(a)||!$.support.leadingWhitespace&&Pa.test(a)||_a[(Ra.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(Qa,"<$1></$2>");try{for(;e>d;d++)c=this[d]||{},1===c.nodeType&&($.cleanData(c.getElementsByTagName("*")),c.innerHTML=a);c=0}catch(f){}}c&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(a){return h(this[0])?this.length?this.pushStack($($.isFunction(a)?a():a),"replaceWith",a):this:$.isFunction(a)?this.each(function(b){var c=$(this),d=c.html();c.replaceWith(a.call(this,b,d))}):("string"!=typeof a&&(a=$(a).detach()),this.each(function(){var b=this.nextSibling,c=this.parentNode;$(this).remove(),b?$(b).before(a):$(c).append(a)}))},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){a=[].concat.apply([],a);var e,f,g,h,i=0,j=a[0],k=[],m=this.length;if(!$.support.checkClone&&m>1&&"string"==typeof j&&Ya.test(j))return this.each(function(){$(this).domManip(a,c,d)});if($.isFunction(j))return this.each(function(e){var f=$(this);a[0]=j.call(this,e,c?f.html():b),f.domManip(a,c,d)});if(this[0]){if(e=$.buildFragment(a,this,k),g=e.fragment,f=g.firstChild,1===g.childNodes.length&&(g=f),f)for(c=c&&$.nodeName(f,"tr"),h=e.cacheable||m-1;m>i;i++)d.call(c&&$.nodeName(this[i],"table")?l(this[i],"tbody"):this[i],i===h?g:$.clone(g,!0,!0));g=f=null,k.length&&$.each(k,function(a,b){b.src?$.ajax?$.ajax({url:b.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):$.error("no ajax"):$.globalEval((b.text||b.textContent||b.innerHTML||"").replace($a,"")),b.parentNode&&b.parentNode.removeChild(b)})}return this}}),$.buildFragment=function(a,c,d){var e,f,g,h=a[0];return c=c||P,c=!c.nodeType&&c[0]||c,c=c.ownerDocument||c,!(1===a.length&&"string"==typeof h&&h.length<512&&c===P&&"<"===h.charAt(0))||Va.test(h)||!$.support.checkClone&&Ya.test(h)||!$.support.html5Clone&&Wa.test(h)||(f=!0,e=$.fragments[h],g=e!==b),e||(e=c.createDocumentFragment(),$.clean(a,c,e,d),f&&($.fragments[h]=g&&e)),{fragment:e,cacheable:f}},$.fragments={},$.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){$.fn[a]=function(c){var d,e=0,f=[],g=$(c),h=g.length,i=1===this.length&&this[0].parentNode;if((null==i||i&&11===i.nodeType&&1===i.childNodes.length)&&1===h)return g[b](this[0]),this;for(;h>e;e++)d=(e>0?this.clone(!0):this).get(),$(g[e])[b](d),f=f.concat(d);return this.pushStack(f,a,g.selector)}}),$.extend({clone:function(a,b,c){var d,e,f,g;if($.support.html5Clone||$.isXMLDoc(a)||!Wa.test("<"+a.nodeName+">")?g=a.cloneNode(!0):(bb.innerHTML=a.outerHTML,bb.removeChild(g=bb.firstChild)),!($.support.noCloneEvent&&$.support.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||$.isXMLDoc(a)))for(n(a,g),d=o(a),e=o(g),f=0;d[f];++f)e[f]&&n(d[f],e[f]);if(b&&(m(a,g),c))for(d=o(a),e=o(g),f=0;d[f];++f)m(d[f],e[f]);return d=e=null,g},clean:function(a,b,c,d){var e,f,g,h,i,j,l,m,n,o,q,r=b===P&&ab,s=[];for(b&&"undefined"!=typeof b.createDocumentFragment||(b=P),e=0;null!=(g=a[e]);e++)if("number"==typeof g&&(g+=""),g){if("string"==typeof g)if(Ta.test(g)){for(r=r||k(b),l=b.createElement("div"),r.appendChild(l),g=g.replace(Qa,"<$1></$2>"),h=(Ra.exec(g)||["",""])[1].toLowerCase(),i=_a[h]||_a._default,j=i[0],l.innerHTML=i[1]+g+i[2];j--;)l=l.lastChild;if(!$.support.tbody)for(m=Sa.test(g),n="table"!==h||m?"<table>"!==i[1]||m?[]:l.childNodes:l.firstChild&&l.firstChild.childNodes,f=n.length-1;f>=0;--f)$.nodeName(n[f],"tbody")&&!n[f].childNodes.length&&n[f].parentNode.removeChild(n[f]);!$.support.leadingWhitespace&&Pa.test(g)&&l.insertBefore(b.createTextNode(Pa.exec(g)[0]),l.firstChild),g=l.childNodes,l.parentNode.removeChild(l)}else g=b.createTextNode(g);g.nodeType?s.push(g):$.merge(s,g)}if(l&&(g=l=r=null),!$.support.appendChecked)for(e=0;null!=(g=s[e]);e++)$.nodeName(g,"input")?p(g):"undefined"!=typeof g.getElementsByTagName&&$.grep(g.getElementsByTagName("input"),p);if(c)for(o=function(a){return!a.type||Za.test(a.type)?d?d.push(a.parentNode?a.parentNode.removeChild(a):a):c.appendChild(a):void 0},e=0;null!=(g=s[e]);e++)$.nodeName(g,"script")&&o(g)||(c.appendChild(g),"undefined"!=typeof g.getElementsByTagName&&(q=$.grep($.merge([],g.getElementsByTagName("script")),o),s.splice.apply(s,[e+1,0].concat(q)),e+=q.length));return s},cleanData:function(a,b){for(var c,d,e,f,g=0,h=$.expando,i=$.cache,j=$.support.deleteExpando,k=$.event.special;null!=(e=a[g]);g++)if((b||$.acceptData(e))&&(d=e[h],c=d&&i[d])){if(c.events)for(f in c.events)k[f]?$.event.remove(e,f):$.removeEvent(e,f,c.handle);i[d]&&(delete i[d],j?delete e[h]:e.removeAttribute?e.removeAttribute(h):e[h]=null,$.deletedIds.push(d))}}}),function(){var a,b;$.uaMatch=function(a){a=a.toLowerCase();var b=/(chrome)[ \/]([\w.]+)/.exec(a)||/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||a.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},a=$.uaMatch(R.userAgent),b={},a.browser&&(b[a.browser]=!0,b.version=a.version),b.chrome?b.webkit=!0:b.webkit&&(b.safari=!0),$.browser=b,$.sub=function(){function a(b,c){return new a.fn.init(b,c)}$.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(c,d){return d&&d instanceof $&&!(d instanceof a)&&(d=a(d)),$.fn.init.call(this,c,d,b)},a.fn.init.prototype=a.fn;var b=a(P);return a}}();var cb,db,eb,fb=/alpha\([^)]*\)/i,gb=/opacity=([^)]*)/,hb=/^(top|right|bottom|left)$/,ib=/^(none|table(?!-c[ea]).+)/,jb=/^margin/,kb=new RegExp("^("+_+")(.*)$","i"),lb=new RegExp("^("+_+")(?!px)[a-z%]+$","i"),mb=new RegExp("^([-+])=("+_+")","i"),nb={BODY:"block"},ob={position:"absolute",visibility:"hidden",display:"block"},pb={letterSpacing:0,fontWeight:400},qb=["Top","Right","Bottom","Left"],rb=["Webkit","O","Moz","ms"],sb=$.fn.toggle;$.fn.extend({css:function(a,c){return $.access(this,function(a,c,d){return d!==b?$.style(a,c,d):$.css(a,c)},a,c,arguments.length>1)},show:function(){return s(this,!0)},hide:function(){return s(this)},toggle:function(a,b){var c="boolean"==typeof a;return $.isFunction(a)&&$.isFunction(b)?sb.apply(this,arguments):this.each(function(){(c?a:r(this))?$(this).show():$(this).hide()})}}),$.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=cb(a,"opacity");return""===c?"1":c}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":$.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var f,g,h,i=$.camelCase(c),j=a.style;if(c=$.cssProps[i]||($.cssProps[i]=q(j,i)),h=$.cssHooks[c]||$.cssHooks[i],d===b)return h&&"get"in h&&(f=h.get(a,!1,e))!==b?f:j[c];if(g=typeof d,"string"===g&&(f=mb.exec(d))&&(d=(f[1]+1)*f[2]+parseFloat($.css(a,c)),g="number"),!(null==d||"number"===g&&isNaN(d)||("number"!==g||$.cssNumber[i]||(d+="px"),h&&"set"in h&&(d=h.set(a,d,e))===b)))try{j[c]=d}catch(k){}}},css:function(a,c,d,e){var f,g,h,i=$.camelCase(c);return c=$.cssProps[i]||($.cssProps[i]=q(a.style,i)),h=$.cssHooks[c]||$.cssHooks[i],h&&"get"in h&&(f=h.get(a,!0,e)),f===b&&(f=cb(a,c)),"normal"===f&&c in pb&&(f=pb[c]),d||e!==b?(g=parseFloat(f),d||$.isNumeric(g)?g||0:f):f},swap:function(a,b,c){var d,e,f={};for(e in b)f[e]=a.style[e],a.style[e]=b[e];d=c.call(a);for(e in b)a.style[e]=f[e];return d}}),a.getComputedStyle?cb=function(b,c){var d,e,f,g,h=a.getComputedStyle(b,null),i=b.style;return h&&(d=h.getPropertyValue(c)||h[c],""!==d||$.contains(b.ownerDocument,b)||(d=$.style(b,c)),lb.test(d)&&jb.test(c)&&(e=i.width,f=i.minWidth,g=i.maxWidth,i.minWidth=i.maxWidth=i.width=d,d=h.width,i.width=e,i.minWidth=f,i.maxWidth=g)),d}:P.documentElement.currentStyle&&(cb=function(a,b){var c,d,e=a.currentStyle&&a.currentStyle[b],f=a.style;return null==e&&f&&f[b]&&(e=f[b]),lb.test(e)&&!hb.test(b)&&(c=f.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),f.left="fontSize"===b?"1em":e,e=f.pixelLeft+"px",f.left=c,d&&(a.runtimeStyle.left=d)),""===e?"auto":e}),$.each(["height","width"],function(a,b){$.cssHooks[b]={get:function(a,c,d){return c?0===a.offsetWidth&&ib.test(cb(a,"display"))?$.swap(a,ob,function(){return v(a,b,d)}):v(a,b,d):void 0},set:function(a,c,d){return t(a,c,d?u(a,b,d,$.support.boxSizing&&"border-box"===$.css(a,"boxSizing")):0)}}}),$.support.opacity||($.cssHooks.opacity={get:function(a,b){return gb.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=$.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,b>=1&&""===$.trim(f.replace(fb,""))&&c.removeAttribute&&(c.removeAttribute("filter"),d&&!d.filter)||(c.filter=fb.test(f)?f.replace(fb,e):f+" "+e)}}),$(function(){$.support.reliableMarginRight||($.cssHooks.marginRight={get:function(a,b){return $.swap(a,{display:"inline-block"},function(){return b?cb(a,"marginRight"):void 0})}}),!$.support.pixelPosition&&$.fn.position&&$.each(["top","left"],function(a,b){$.cssHooks[b]={get:function(a,c){if(c){var d=cb(a,b);return lb.test(d)?$(a).position()[b]+"px":d}}}})}),$.expr&&$.expr.filters&&($.expr.filters.hidden=function(a){return 0===a.offsetWidth&&0===a.offsetHeight||!$.support.reliableHiddenOffsets&&"none"===(a.style&&a.style.display||cb(a,"display"))},$.expr.filters.visible=function(a){return!$.expr.filters.hidden(a)}),$.each({margin:"",padding:"",border:"Width"},function(a,b){$.cssHooks[a+b]={expand:function(c){var d,e="string"==typeof c?c.split(" "):[c],f={};for(d=0;4>d;d++)f[a+qb[d]+b]=e[d]||e[d-2]||e[0];return f}},jb.test(a)||($.cssHooks[a+b].set=t)});var tb=/%20/g,ub=/\[\]$/,vb=/\r?\n/g,wb=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,xb=/^(?:select|textarea)/i;$.fn.extend({serialize:function(){return $.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?$.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||xb.test(this.nodeName)||wb.test(this.type))}).map(function(a,b){var c=$(this).val();return null==c?null:$.isArray(c)?$.map(c,function(a){return{name:b.name,value:a.replace(vb,"\r\n")}}):{name:b.name,value:c.replace(vb,"\r\n")}}).get()}}),$.param=function(a,c){var d,e=[],f=function(a,b){b=$.isFunction(b)?b():null==b?"":b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(c===b&&(c=$.ajaxSettings&&$.ajaxSettings.traditional),$.isArray(a)||a.jquery&&!$.isPlainObject(a))$.each(a,function(){f(this.name,this.value)});else for(d in a)x(d,a[d],c,f);return e.join("&").replace(tb,"+")};var yb,zb,Ab=/#.*$/,Bb=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Cb=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,Db=/^(?:GET|HEAD)$/,Eb=/^\/\//,Fb=/\?/,Gb=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,Hb=/([?&])_=[^&]*/,Ib=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Jb=$.fn.load,Kb={},Lb={},Mb=["*/"]+["*"];try{zb=Q.href}catch(Nb){zb=P.createElement("a"),zb.href="",zb=zb.href}yb=Ib.exec(zb.toLowerCase())||[],$.fn.load=function(a,c,d){if("string"!=typeof a&&Jb)return Jb.apply(this,arguments);if(!this.length)return this;var e,f,g,h=this,i=a.indexOf(" ");return i>=0&&(e=a.slice(i,a.length),a=a.slice(0,i)),$.isFunction(c)?(d=c,c=b):c&&"object"==typeof c&&(f="POST"),$.ajax({url:a,type:f,dataType:"html",data:c,complete:function(a,b){d&&h.each(d,g||[a.responseText,b,a])}}).done(function(a){g=arguments,h.html(e?$("<div>").append(a.replace(Gb,"")).find(e):a)}),this},$.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){$.fn[b]=function(a){return this.on(b,a)}}),$.each(["get","post"],function(a,c){$[c]=function(a,d,e,f){return $.isFunction(d)&&(f=f||e,e=d,d=b),$.ajax({type:c,url:a,data:d,success:e,dataType:f})}}),$.extend({getScript:function(a,c){return $.get(a,b,c,"script")},getJSON:function(a,b,c){return $.get(a,b,c,"json")},ajaxSetup:function(a,b){return b?A(a,$.ajaxSettings):(b=a,a=$.ajaxSettings),A(a,b),a},ajaxSettings:{url:zb,isLocal:Cb.test(yb[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":Mb},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":$.parseJSON,"text xml":$.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:y(Kb),ajaxTransport:y(Lb),ajax:function(a,c){
diff --git a/js/manage_tables.js b/js/manage_tables.js
index 13f170e6b..5bfa1b719 100644
--- a/js/manage_tables.js
+++ b/js/manage_tables.js
@@ -189,14 +189,12 @@ function do_delete(url)
 				});
 			});
 			
-			set_feedback(response.message,'success_message',false);	
+			set_feedback(response.message, 'alert alert-dismissible alert-success', false);	
 		}
 		else
 		{
-			set_feedback(response.message,'error_message',true);	
+			set_feedback(response.message, 'alert alert-dismissible alert-danger', true);	
 		}
-		
-
 	},"json");
 }
 
@@ -277,8 +275,7 @@ function enable_row_selection(rows)
 	);
 	
 	rows.click(function row_click(event)
-	{	
-
+	{
 		var checkbox = $(this).find(":checkbox");
 		checkbox.attr('checked',!checkbox.attr('checked'));
 		do_email(enable_email.url);
@@ -310,7 +307,8 @@ function update_sortable_table()
 	}
 }
 
-function get_table_row(id) {
+function get_table_row(id)
+{
 	id = id || $("input[name='sale_id']").val();
 	var $element = $("#sortable_table tbody :checkbox[value='" + id + "']");
 	if ($element.length === 0) {
diff --git a/templates/flatly/css/style.css b/templates/flatly/css/style.css
index 95c2f55bf..967273bc5 100644
--- a/templates/flatly/css/style.css
+++ b/templates/flatly/css/style.css
@@ -1,160 +1,77 @@
 /* additional styles placed here */
 
-html, body {
-	height: 100%;
-}
-
-body {
-	/*padding-top: 80px;*/
-}
-
-.topbar {
-	color: #eee;
-	font-size: 12px;
-	background: #182735;
-	padding: 5px;
-}
-
-.wrapper {
-	min-height: 100%;
-	margin-bottom: -75px;
-}
-
-.navbar {
-	min-height: 40px;
-	border-radius: 0;
-}
-
-.navbar-brand {
-	padding: 22px 15px;
-	height: 40px;
-}
-
-.navbar-default .navbar-nav > .active > a, 
-.navbar-default .navbar-nav > .active > a:hover, 
-.navbar-default .navbar-nav > .active > a:focus {
-	color: #2C3E50;
-	background-color: #FFFFFF;
-}
-
-table.tablesorter {
+table.tablesorter
+{
 	border: 0;	
 }
 
-table.tablesorter tbody td {
+table.tablesorter tbody td
+{
 	padding: 8px;
 }
 
-table.tablesorter tbody td.over {
+table.tablesorter tbody td.over
+{
 	background-color: #F5F5F5;
 }
 
-table.tablesorter tbody td.selected {
+table.tablesorter tbody td.selected
+{
 	background-color: #ECECEC;
 }
 
-table.tablesorter thead tr th, table.tablesorter tfoot tr th {
+table.tablesorter thead tr th, table.tablesorter tfoot tr th
+{
 	padding: 8px;
 }
 
-#table_action_header {
+#table_action_header
+{
 	height: 35px;
 	background-color: transparent;
 	border: 0;
 }
 
-table.tablesorter thead tr th, table.tablesorter tfoot tr th {
+table.tablesorter thead tr th, table.tablesorter tfoot tr th
+{
 	background-color: #999999;
 }
 
-#search_filter_section {
+#search_filter_section
+{
 	padding: 5px;
 	margin-bottom: 10px;
 }
 
-#titleTextImg {
+#titleTextImg
+{
 	background-color: transparent !important;
 }
 
-#table_action_header ul li span a {
+#table_action_header ul li span a
+{
 	background-color: rgba(0, 0, 0, 0);
 	border: 0;
 	color: #aaa;
 }
 
-#table_action_header ul li span a:hover {
+#table_action_header ul li span a:hover
+{
 	color: #555;
 }
 
-#title,
-#page_title {
-	font-size: 22px;
-	margin-top: 21px;
-	margin-bottom: 10.5px;
-	font-family: "Lato", "Helvetica Neue", Helvetica, Arial, sans-serif;
-	font-weight: 400;
-	line-height: 1.1;
-	color: inherit;
-}
-
-#home_module_list {
-	padding: 20px 0;
-	text-align: center;
-}
-
-.module_item {
-	min-width: 105px;
-	display: inline-block;
-	text-align: center;
-	margin-bottom: 3px;
-}
-
-.module_item a {
-	display: block;
-}
-
-.navbar .menu-icon {
-	text-align: center;
-	font-size: 12px;
-}
-
-.navbar .menu-icon img {
-	width: 24px;
-}
-
-#main_container {
-	font-size: 14px;
-	line-height: 1.5;
-}
-
-#feedback_bar {
-	position: fixed;
-	bottom: 0;
-	left: 0;
-	width: 100%;
-	height: 55px;	
-	position: fixed;
-	opacity: 0;
-	filter: alpha(opacity=0);
-	z-index: 1;
-	line-height: 3.3;
-}
-
-#register th {	
-	background-color: #999999;
-	padding: 5px;
-	text-align: center;
-	color: #FFFFFF;
-}
-
-@media (min-width: 768px) {	
-	.navbar-nav > li > a {
+@media (min-width: 768px)
+{	
+	.navbar-nav > li > a
+	{
 		padding: 10px 10px 9px;
 	}
 }
 
-@media print {    
-    .no-print, .no-print * {
+@media print
+{    
+    .no-print, .no-print *
+	{
         display: none !important;
     }
 }
\ No newline at end of file