diff --git a/application/views/customers/excel_import.php b/application/views/customers/excel_import.php
index 90e25cb32..55c06c8e3 100644
--- a/application/views/customers/excel_import.php
+++ b/application/views/customers/excel_import.php
@@ -1,9 +1,9 @@
-<?php echo form_open_multipart('customers/do_excel_import/', array('id'=>'item_form', 'class'=>'form-horizontal')); ?>
-	<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>
-	<fieldset id="item_basic_info">
-		<legend><?php echo $this->lang->line('common_import'); ?></legend>
+<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>
+
+<?php echo form_open_multipart('customers/do_excel_import/', array('id'=>'item_form', 'class'=>'form-horizontal')); ?>
+	<fieldset id="item_basic_info">
 		<div class="form-group form-group-sm">
 			<div class="col-xs-6">
 				<a href="<?php echo site_url('customers/excel'); ?>"><?php echo $this->lang->line('common_download_import_template'); ?></a>
@@ -11,7 +11,7 @@
 		</div>
 
 		<div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('common_import_file_path'), 'name', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label($this->lang->line('common_import_file_path'), 'name', array('class'=>'control-label col-xs-3')); ?>
 			<div class='col-xs-6'>
 				<label class="file">
 					<input type="file" id="file_input" name="file_input">
@@ -19,11 +19,10 @@
 				</label>
 			</div>
 		</div>
-
 	</fieldset>
 <?php echo form_close(); ?>
-<script type='text/javascript'>
 
+<script type='text/javascript'>
 //validation and submit handling
 $(document).ready(function()
 {	
diff --git a/application/views/customers/form.php b/application/views/customers/form.php
index 697514a3c..74916991a 100644
--- a/application/views/customers/form.php
+++ b/application/views/customers/form.php
@@ -1,40 +1,41 @@
-<?php echo form_open('customers/save/'.$person_info->person_id, array('id'=>'customer_form', 'class'=>'form-horizontal')); ?>
 <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="form-group form-group-sm">
-	<?php echo form_label($this->lang->line('customers_company_name'), 'company_name', array('class' => 'control-label col-xs-3')); ?>
-		<div class='col-xs-6'>
-		<?php echo form_input(array(
-			'name'=>'company_name',
-			'class'=>'form-control input-sm',
-			'value'=>$person_info->company_name)
-		);?>
-		</div>
-	</div>
+<?php echo form_open('customers/save/'.$person_info->person_id, array('id'=>'customer_form', 'class'=>'form-horizontal')); ?>
+	<fieldset id="customer_basic_info">
+		<?php $this->load->view("people/form_basic_info"); ?>
 
-	<div class="form-group form-group-sm">
-	<?php echo form_label($this->lang->line('customers_account_number'), 'account_number', array('class' => 'control-label col-xs-3')); ?>
-		<div class='col-xs-6'>
-		<?php echo form_input(array(
-			'name'=>'account_number',
-			'id'=>'account_number',
-			'class'=>'account_number form-control',
-			'value'=>$person_info->account_number)
-		);?>
+		<div class="form-group form-group-sm">
+		<?php echo form_label($this->lang->line('customers_company_name'), 'company_name', array('class' => 'control-label col-xs-3')); ?>
+			<div class='col-xs-6'>
+				<?php echo form_input(array(
+					'name'=>'company_name',
+					'class'=>'form-control input-sm',
+					'value'=>$person_info->company_name)
+					);?>
+			</div>
 		</div>
-	</div>
 
-	<div class="form-group form-group-sm">
-	<?php echo form_label($this->lang->line('customers_taxable'), 'taxable', array('class' => 'control-label col-xs-3')); ?>
-		<div class='col-xs-1'>
-		<?php echo form_checkbox('taxable', '1', $person_info->taxable == '' ? TRUE : (boolean)$person_info->taxable);?>
+		<div class="form-group form-group-sm">
+		<?php echo form_label($this->lang->line('customers_account_number'), 'account_number', array('class' => 'control-label col-xs-3')); ?>
+			<div class='col-xs-6'>
+				<?php echo form_input(array(
+					'name'=>'account_number',
+					'id'=>'account_number',
+					'class'=>'account_number form-control',
+					'value'=>$person_info->account_number)
+					);?>
+			</div>
 		</div>
-	</div>
-</fieldset>
+
+		<div class="form-group form-group-sm">
+		<?php echo form_label($this->lang->line('customers_taxable'), 'taxable', array('class' => 'control-label col-xs-3')); ?>
+			<div class='col-xs-1'>
+				<?php echo form_checkbox('taxable', '1', $person_info->taxable == '' ? TRUE : (boolean)$person_info->taxable);?>
+			</div>
+		</div>
+	</fieldset>
 <?php echo form_close(); ?>
 
 <script type='text/javascript'>
diff --git a/application/views/employees/form.php b/application/views/employees/form.php
index 5fc42b385..5f9ae997a 100644
--- a/application/views/employees/form.php
+++ b/application/views/employees/form.php
@@ -1,7 +1,8 @@
-<?php echo form_open('employees/save/'.$person_info->person_id, array('id'=>'employee_form', 'class'=> 'form-horizontal')); ?>
-	<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>
+<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('employees/save/'.$person_info->person_id, array('id'=>'employee_form', 'class'=> 'form-horizontal')); ?>
 	<ul class="nav nav-tabs nav-justified" data-tabs="tabs">
 		<li class="active" role="presentation">
 			<a data-toggle="tab" href="#employee_basic_info"><?php echo $this->lang->line("employees_basic_information"); ?></a>
diff --git a/application/views/giftcards/form.php b/application/views/giftcards/form.php
index 410620d04..77baf6dbc 100644
--- a/application/views/giftcards/form.php
+++ b/application/views/giftcards/form.php
@@ -1,43 +1,42 @@
 <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', 'class'=>'form-horizontal')); ?>
 	<fieldset id="giftcard_basic_info" style="padding: 5px;">
-		<legend><?php echo $this->lang->line("giftcards_basic_information"); ?></legend>
-
 		<div class="form-group form-group-sm">
 		<?php echo form_label($this->lang->line('giftcards_person_id').':', 'name', array('class'=>'control-label col-xs-3')); ?>
 			<div class='col-xs-6'>
-			<?php echo form_input(array(
-				'name'=>'person_id',
-				'id'=>'person_id',
-				'class'=>'form-control input-sm',
-				'value'=>$selected_person)
-			);?>
+				<?php echo form_input(array(
+					'name'=>'person_id',
+					'id'=>'person_id',
+					'class'=>'form-control input-sm',
+					'value'=>$selected_person)
+					);?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
 		<?php echo form_label($this->lang->line('giftcards_giftcard_number').':', 'name', array('class'=>'required control-label col-xs-3')); ?>
 			<div class='col-xs-6'>
-			<?php echo form_input(array(
-				'name'=>'giftcard_number',
-				'id'=>'giftcard_number',
-				'class'=>'form-control input-sm',
-				'value'=>$giftcard_number)
-			);?>
+				<?php echo form_input(array(
+					'name'=>'giftcard_number',
+					'id'=>'giftcard_number',
+					'class'=>'form-control input-sm',
+					'value'=>$giftcard_number)
+					);?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
 		<?php echo form_label($this->lang->line('giftcards_card_value').':', 'name', array('class'=>'required control-label col-xs-3')); ?>
 			<div class='col-xs-6'>
-			<?php echo form_input(array(
-				'name'=>'value',
-				'id'=>'value',
-				'class'=>'form-control input-sm',
-				'value'=>$giftcard_info->value)
-			);?>
+				<?php echo form_input(array(
+					'name'=>'value',
+					'id'=>'value',
+					'class'=>'form-control input-sm',
+					'value'=>$giftcard_info->value)
+					);?>
 			</div>
 		</div>
 	</fieldset>
diff --git a/application/views/item_kits/form.php b/application/views/item_kits/form.php
index c733301c0..4b022ac56 100644
--- a/application/views/item_kits/form.php
+++ b/application/views/item_kits/form.php
@@ -1,72 +1,69 @@
 <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', 'class' => 'form-horizontal')); ?>
+	<fieldset id="item_kit_info">
+		<div class="form-group form-group-sm">
+			<?php echo form_label($this->lang->line('item_kits_name').':', 'name', array('class'=>'control-label col-xs-3 required')); ?>
+			<div class='col-xs-6'>
+				<?php echo form_input(array(
+					'name'=>'name',
+					'id'=>'name',
+					'class'=>'form-control input-sm',
+					'value'=>$item_kit_info->name)
+					);?>
+			</div>
+		</div>
 
-<fieldset id="item_kit_info">
-	<legend><?php echo $this->lang->line("item_kits_info"); ?></legend>
+		<div class="form-group form-group-sm">
+			<?php echo form_label($this->lang->line('item_kits_description').':', 'description', array('class'=>'control-label col-xs-3')); ?>
+			<div class='col-xs-6'>
+				<?php echo form_textarea(array(
+					'name'=>'description',
+					'id'=>'description',
+					'class'=>'form-control input-sm',
+					'value'=>$item_kit_info->description)
+					);?>
+			</div>
+		</div>
 
-    <div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('item_kits_name').':', 'name', array('class'=>'control-label col-xs-3 required')); ?>
-        <div class='col-xs-6'>
-        <?php echo form_input(array(
-            'name'=>'name',
-            'id'=>'name',
-            'class'=>'form-control input-sm',
-            'value'=>$item_kit_info->name)
-        );?>
-        </div>
-    </div>
+		<div class="form-group form-group-sm">
+			<?php echo form_label($this->lang->line('item_kits_add_item').':', 'item', array('class'=>'control-label col-xs-3')); ?>
+			<div class='col-xs-6'>
+				<?php echo form_input(array(
+					'name'=>'item',
+					'id'=>'item',
+					'class'=>'form-control input-sm')
+					);?>
+			</div>
+		</div>
 
-    <div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('item_kits_description').':', 'description', array('class'=>'control-label col-xs-3')); ?>
-        <div class='col-xs-6'>
-        <?php echo form_textarea(array(
-            'name'=>'description',
-            'id'=>'description',
-            'class'=>'form-control input-sm',
-            'value'=>$item_kit_info->description,
-            )
-        );?>
-        </div>
-    </div>
-
-    <div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('item_kits_add_item').':', 'item', array('class'=>'control-label col-xs-3')); ?>
-        <div class='col-xs-6'>
-            <?php echo form_input(array(
-                'name'=>'item',
-                'id'=>'item',
-                'class'=>'form-control input-sm',
-            ));?>
-        </div>
-    </div>
-
-    <table id="item_kit_items" class="table table-striped table-hover" role="grid">
-		<thead>
-			<tr role="row" class="tablesorter-headerRow">
-				<th role="columnheader"><?php echo $this->lang->line('common_delete'); ?></th>
-				<th role="columnheader"><?php echo $this->lang->line('item_kits_item'); ?></th>
-				<th role="columnheader"><?php echo $this->lang->line('item_kits_quantity'); ?></th>
-			</tr>
-		</thead>
-		<tbody>
-			<?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);'><span class='glyphicon glyphicon-trash'></span></a></td>
-					<td><?php echo $item_info->name; ?></td>
-					<td><input class='quantity form-control input-sm' id='item_kit_item_<?php echo $item_kit_item['item_id'] ?>' name=item_kit_item[<?php echo $item_kit_item['item_id'] ?>] value='<?php echo $item_kit_item['quantity'] ?>'/></td>
+		<table id="item_kit_items" class="table table-striped table-hover" role="grid">
+			<thead>
+				<tr role="row" class="tablesorter-headerRow">
+					<th role="columnheader"><?php echo $this->lang->line('common_delete'); ?></th>
+					<th role="columnheader"><?php echo $this->lang->line('item_kits_item'); ?></th>
+					<th role="columnheader"><?php echo $this->lang->line('item_kits_quantity'); ?></th>
 				</tr>
-			<?php
-			}
-			?>
-		</tbody>
-    </table>
-</fieldset>
+			</thead>
+			<tbody>
+				<?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);'><span class='glyphicon glyphicon-trash'></span></a></td>
+						<td><?php echo $item_info->name; ?></td>
+						<td><input class='quantity form-control input-sm' id='item_kit_item_<?php echo $item_kit_item['item_id'] ?>' name=item_kit_item[<?php echo $item_kit_item['item_id'] ?>] value='<?php echo $item_kit_item['quantity'] ?>'/></td>
+					</tr>
+				<?php
+				}
+				?>
+			</tbody>
+		</table>
+	</fieldset>
 <?php echo form_close(); ?>
 
 <script type='text/javascript'>
diff --git a/application/views/items/excel_import.php b/application/views/items/excel_import.php
index 2dd35e528..6746fd79f 100644
--- a/application/views/items/excel_import.php
+++ b/application/views/items/excel_import.php
@@ -1,28 +1,25 @@
+<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>
+
 <?php echo form_open_multipart('items/do_excel_import/', array('id'=>'item_form', 'class' => 'form-horizontal')); ?>
-	<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>
-
-<fieldset id="item_basic_info">
-	<legend><?php echo $this->lang->line('common_import'); ?></legend>
-
-	<div class="form-group form-group-sm">
-		<div class="col-xs-6">
-			<a href="<?php echo site_url('items/excel'); ?>"><?php echo $this->lang->line('common_download_import_template'); ?></a>
+	<fieldset id="item_basic_info">
+		<div class="form-group form-group-sm">
+			<div class="col-xs-6">
+				<a href="<?php echo site_url('items/excel'); ?>"><?php echo $this->lang->line('common_download_import_template'); ?></a>
+			</div>
 		</div>
-	</div>
 
-	<div class="form-group form-group-sm">
-	<?php echo form_label($this->lang->line('common_import_file_path'), 'name', array('class'=>'control-label col-xs-3')); ?>
-		<div class='col-xs-6'>
-			<label class="file">
-				<input type="file" id="item_image" name="file_path">
-				<span class="file-custom"></span>
-			</label>
+		<div class="form-group form-group-sm">
+			<?php echo form_label($this->lang->line('common_import_file_path'), 'name', array('class'=>'control-label col-xs-3')); ?>
+			<div class='col-xs-6'>
+				<label class="file">
+					<input type="file" id="item_image" name="file_path">
+					<span class="file-custom"></span>
+				</label>
+			</div>
 		</div>
-	</div>
-
-</fieldset>
-
+	</fieldset>
 <?php echo form_close(); ?>
 
 <script type='text/javascript'>
diff --git a/application/views/items/form.php b/application/views/items/form.php
index b49ec32c0..cc4628854 100644
--- a/application/views/items/form.php
+++ b/application/views/items/form.php
@@ -4,8 +4,6 @@
 
 <?php echo form_open('items/save/'.$item_info->item_id, array('id'=>'item_form', 'enctype'=>'multipart/form-data', 'class' => 'form-horizontal')); ?>
 	<fieldset id="item_basic_info">
-		<legend><?php echo $this->lang->line("items_basic_information"); ?></legend>
-
 		<div class="form-group form-group-sm">
 			<?php echo form_label($this->lang->line('items_item_number'), 'item_number', array('class'=>'control-label col-xs-3')); ?>
 			<div class='col-xs-6'>
@@ -17,7 +15,7 @@
 							'id'=>'item_number',
 							'class'=>'form-control input-sm',
 							'value'=>$item_info->item_number)
-					);?>
+							);?>
 				</div>
 			</div>
 		</div>
@@ -30,7 +28,7 @@
 						'id'=>'name',
 						'class'=>'form-control input-sm',
 						'value'=>$item_info->name)
-				);?>
+						);?>
 			</div>
 		</div>
 
@@ -44,7 +42,7 @@
 							'id'=>'category',
 							'class'=>'form-control input-sm',
 							'value'=>$item_info->category)
-					);?>
+							);?>
 				</div>
 			</div>
 		</div>
diff --git a/application/views/people/form_basic_info.php b/application/views/people/form_basic_info.php
index 2b3228c41..0d9cccead 100644
--- a/application/views/people/form_basic_info.php
+++ b/application/views/people/form_basic_info.php
@@ -36,11 +36,11 @@
 		</label>
 		<label class="radio-inline">
 			<?php echo form_radio(array(
-					'name'=>'gender',
-					'type'=>'radio',
-					'id'=>'gender',
-					'value'=>0,
-					'checked'=>$person_info->gender === '0')
+				'name'=>'gender',
+				'type'=>'radio',
+				'id'=>'gender',
+				'value'=>0,
+				'checked'=>$person_info->gender === '0')
 				); ?> <?php echo $this->lang->line('common_gender_female'); ?>
 		</label>
 
@@ -53,10 +53,10 @@
 		<div class="input-group">
 			<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-envelope"></span></span>
 			<?php echo form_input(array(
-					'name'=>'email',
-					'id'=>'email',
-					'class'=>'form-control input-sm',
-					'value'=>$person_info->email)
+				'name'=>'email',
+				'id'=>'email',
+				'class'=>'form-control input-sm',
+				'value'=>$person_info->email)
 				);?>
 		</div>
 	</div>
diff --git a/application/views/suppliers/form.php b/application/views/suppliers/form.php
index 1ed47437f..a8eb150d1 100644
--- a/application/views/suppliers/form.php
+++ b/application/views/suppliers/form.php
@@ -1,45 +1,46 @@
+<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('suppliers/save/'.$person_info->person_id, array('id'=>'supplier_form', 'class' => 'form-horizontal')); ?>
-	<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="form-group form-group-sm">
-	<?php echo form_label($this->lang->line('suppliers_company_name'), 'company_name', array('class'=>'required control-label col-xs-3')); ?>
-		<div class='col-xs-6'>
-		<?php echo form_input(array(
-			'name'=>'company_name',
-			'id'=>'company_name_input',
-			'class'=>'form-control input-sm',
-			'value'=>$person_info->company_name)
-		);?>
+		<div class="form-group form-group-sm">
+		<?php echo form_label($this->lang->line('suppliers_company_name'), 'company_name', array('class'=>'required control-label col-xs-3')); ?>
+			<div class='col-xs-6'>
+				<?php echo form_input(array(
+					'name'=>'company_name',
+					'id'=>'company_name_input',
+					'class'=>'form-control input-sm',
+					'value'=>$person_info->company_name)
+					);?>
+			</div>
 		</div>
-	</div>
 
-	<div class="form-group form-group-sm">	
-	<?php echo form_label($this->lang->line('suppliers_agency_name'), 'agency_name', array('class'=>'control-label col-xs-3')); ?>
-		<div class='col-xs-6'>
-		<?php echo form_input(array(
-			'name'=>'agency_name',
-			'id'=>'agency_name_input',
-			'class'=>'form-control input-sm',
-			'value'=>$person_info->agency_name)
-		);?>
+		<div class="form-group form-group-sm">	
+		<?php echo form_label($this->lang->line('suppliers_agency_name'), 'agency_name', array('class'=>'control-label col-xs-3')); ?>
+			<div class='col-xs-6'>
+				<?php echo form_input(array(
+					'name'=>'agency_name',
+					'id'=>'agency_name_input',
+					'class'=>'form-control input-sm',
+					'value'=>$person_info->agency_name)
+					);?>
+			</div>
 		</div>
-	</div>
 
-	<?php $this->load->view("people/form_basic_info"); ?>
-	<div class="form-group form-group-sm">	
-	<?php echo form_label($this->lang->line('suppliers_account_number'), 'account_number', array('class'=>'control-label col-xs-3')); ?>
-		<div class='col-xs-6'>
-		<?php echo form_input(array(
-			'name'=>'account_number',
-			'id'=>'account_number',
-			'class'=>'form-control input-sm',
-			'value'=>$person_info->account_number)
-		);?>
+		<?php $this->load->view("people/form_basic_info"); ?>
+
+		<div class="form-group form-group-sm">	
+		<?php echo form_label($this->lang->line('suppliers_account_number'), 'account_number', array('class'=>'control-label col-xs-3')); ?>
+			<div class='col-xs-6'>
+				<?php echo form_input(array(
+					'name'=>'account_number',
+					'id'=>'account_number',
+					'class'=>'form-control input-sm',
+					'value'=>$person_info->account_number)
+					);?>
+			</div>
 		</div>
-	</div>
 	</fieldset>
 <?php echo form_close(); ?>