diff --git a/application/config/config.php b/application/config/config.php
index 852695a7e..6fbd90400 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -18,7 +18,6 @@ $config['application_version'] = '2.4';
 |--------------------------------------------------------------------------
 |
 | URL to your CodeIgniter root. Typically this will be your base URL,
-| WITH a trailing slash:
 |
 |	http://example.com/
 |
diff --git a/application/views/configs/barcode_config.php b/application/views/configs/barcode_config.php
index cd803993f..8d82b395d 100644
--- a/application/views/configs/barcode_config.php
+++ b/application/views/configs/barcode_config.php
@@ -5,8 +5,7 @@
         <fieldset id="config_info">
             <div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
             <ul id="barcode_error_message_box" class="error_message_box"></ul>
-            <legend><?php echo $this->lang->line("config_barcode_info"); ?></legend>
-            
+
             <div class="field_row clearfix">    
             <?php echo form_label($this->lang->line('config_barcode_type').':', 'barcode_type',array('class'=>'wide')); ?>
                 <div class='form_field'>
diff --git a/application/views/configs/general_config.php b/application/views/configs/general_config.php
index 6f6f9f701..2db20f102 100644
--- a/application/views/configs/general_config.php
+++ b/application/views/configs/general_config.php
@@ -5,7 +5,6 @@
 		<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')); ?>
diff --git a/application/views/configs/locale_config.php b/application/views/configs/locale_config.php
index a6b65e8ae..85ef1fdf3 100644
--- a/application/views/configs/locale_config.php
+++ b/application/views/configs/locale_config.php
@@ -5,9 +5,8 @@
 		<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">	
+			<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(
diff --git a/application/views/configs/manage.php b/application/views/configs/manage.php
index 5167bc1d1..87ea8c103 100644
--- a/application/views/configs/manage.php
+++ b/application/views/configs/manage.php
@@ -1,36 +1,54 @@
 <?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>
-    <li><a href="#barcode_config">Barcode</a></li>
-    <li><a href="#stock_config">Stock</a></li>
-    <li><a href="#receipt_config">Receipt</a></li>
+<ul class="nav nav-tabs">
+    <li class="active" role="presentation">
+        <a href="#">General</a>
+    </li>
+    <li role="presentation">
+        <a href="#">Locale</a>
+    </li>
+    <li role="presentation">
+        <a href="#">Barcode</a>
+    </li>
+    <li role="presentation">
+        <a href="#">Stock</a>
+    </li>
+    <li role="presentation">
+        <a href="#">Receipt</a>
+    </li>
 </ul>
 
-<div class="tabcontents">
-    <div id="general_config">
+<div id="tab_contents">
+    <div>
         <?php $this->load->view("configs/general_config"); ?>
     </div>
-    <div id="locale_config">
+    <div>
         <?php $this->load->view("configs/locale_config"); ?>
     </div>
-    <div id="barcode_config">
+    <div>
         <?php $this->load->view("configs/barcode_config"); ?>
     </div>
-    <div id="stock_config">
+    <div>
         <?php $this->load->view("configs/stock_config"); ?>
     </div>
-    <div id="receipt_config">
+    <div>
         <?php $this->load->view("configs/receipt_config"); ?>
     </div>
 </div>
 
+<script type="text/javascript">
+    $(document).ready(function() {
+        $(".nav-tabs li a").click(function () {
+            var $parent = $(this).parents("li");
+            $parent.addClass("active").siblings().removeClass("active");
+            $("#tab_contents > div").hide().filter("div:eq(" + $parent.index() + ")").show();
+            return false;
+        });
+    });
+</script>
+
 <?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 236ae048c..a68612194 100644
--- a/application/views/configs/receipt_config.php
+++ b/application/views/configs/receipt_config.php
@@ -5,7 +5,6 @@
 		<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')); ?>
diff --git a/application/views/configs/stock_config.php b/application/views/configs/stock_config.php
index daf6605eb..a82c33225 100644
--- a/application/views/configs/stock_config.php
+++ b/application/views/configs/stock_config.php
@@ -5,8 +5,7 @@
         <fieldset id="config_info">
             <div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
             <ul id="location_error_message_box" class="error_message_box"></ul>
-            <legend><?php echo $this->lang->line("config_location_info"); ?></legend>
-            
+
             <div id="stock_locations">
 				<?php $this->load->view('partial/stock_locations', array('stock_locations' => $stock_locations)); ?>
 			</div>