diff --git a/application/language/en/config_lang.php b/application/language/en/config_lang.php
index a9561accf..44d55b05f 100644
--- a/application/language/en/config_lang.php
+++ b/application/language/en/config_lang.php
@@ -123,7 +123,7 @@ $lang["config_gcaptcha_secret_key"] = "reCAPTCHA Secret Key";
 $lang["config_gcaptcha_secret_key_required"] = "reCAPTCHA Secret Key is a required field";
 $lang["config_gcaptcha_site_key"] = "reCAPTCHA Site Key";
 $lang["config_gcaptcha_site_key_required"] = "reCAPTCHA Site Key is a required field";
-$lang["config_gcaptcha_tooltip"] = "Protect the Login page with Google reCAPTCHA";
+$lang["config_gcaptcha_tooltip"] = "Protect the Login page with Google reCAPTCHA, click the icon for an API key pair";
 $lang["config_general"] = "General";
 $lang["config_general_configuration"] = "General Configuration";
 $lang["config_giftcard_number"] = "Gift Card Number";
@@ -161,6 +161,7 @@ $lang["config_mailchimp_configuration"] = "Mailchimp Configuration";
 $lang["config_mailchimp_key_successfully"] = "Valid API Key";
 $lang["config_mailchimp_key_unsuccessfully"] = "Invalid API Key";
 $lang["config_mailchimp_lists"] = "Mailchimp List(s)";
+$lang["config_mailchimp_tooltip"] = "Click the icon for an API key";
 $lang["config_message"] = "Message";
 $lang["config_message_configuration"] = "Message Configuration";
 $lang["config_msg_msg"] = "Saved Text Message";
@@ -223,7 +224,7 @@ $lang["config_sales_invoice_format"] = "Sales Invoice Format";
 $lang["config_sales_quote_format"] = "Sales Quote Format";
 $lang["config_saved_successfully"] = "Configuration saved successfully";
 $lang["config_saved_unsuccessfully"] = "Configuration saved unsuccessfully";
-$lang["config_statistics"] = "Send statistics";
+$lang["config_statistics"] = "Send Statistics";
 $lang["config_statistics_tooltip"] = "Send statistics for development and feature improvement purposes";
 $lang["config_stock_location"] = "Stock location";
 $lang["config_stock_location_duplicate"] = "Please use an unique location name";
diff --git a/application/views/configs/barcode_config.php b/application/views/configs/barcode_config.php
index 40a4b6b55..089955e7c 100644
--- a/application/views/configs/barcode_config.php
+++ b/application/views/configs/barcode_config.php
@@ -91,6 +91,8 @@
                             'checked'=>$this->config->item('barcode_content') === "number")); ?>
                         <?php echo $this->lang->line('config_barcode_number'); ?>
                     </label>
+					&nbsp
+					&nbsp
 					<label class="checkbox-inline">
                         <?php echo form_checkbox(array(
                             'name' => 'barcode_generate_if_empty',
diff --git a/application/views/configs/general_config.php b/application/views/configs/general_config.php
index f49f43520..cc22a6f80 100644
--- a/application/views/configs/general_config.php
+++ b/application/views/configs/general_config.php
@@ -85,7 +85,10 @@
 						'value' => 'gcaptcha_enable',
 						'checked' => $this->config->item('gcaptcha_enable'))); ?>
 					&nbsp
-					<span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?php echo $this->lang->line('config_gcaptcha_tooltip'); ?>"></span>
+					&nbsp
+					<a href="https://www.google.com/recaptcha/admin" target="_blank">
+						<span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?php echo $this->lang->line('config_gcaptcha_tooltip'); ?>"></span>
+					</a>
 				</div>
 			</div>
 
@@ -133,13 +136,14 @@
 
 			<div class="form-group form-group-sm">
 				<?php echo form_label($this->lang->line('config_statistics'), 'statistics', array('class' => 'control-label col-xs-2')); ?>
-				<div class='col-xs-2'>
+				<div class='col-xs-1'>
 					<?php echo form_checkbox(array(
 						'name' => 'statistics',
 						'id' => 'statistics',
 						'value' => 'statistics',
 						'checked' => $this->config->item('statistics'))); ?>
 					&nbsp
+					&nbsp
 					<span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?php echo $this->lang->line('config_statistics_tooltip'); ?>"></span>
 				</div>
 			</div>
diff --git a/application/views/configs/locale_config.php b/application/views/configs/locale_config.php
index a4449e18e..f2e5aa90a 100644
--- a/application/views/configs/locale_config.php
+++ b/application/views/configs/locale_config.php
@@ -98,7 +98,7 @@
 						$this->config->item('cash_decimals'), array('class' => 'form-control input-sm'));
 					?>
                 </div>
-                <div class='col-xs-1'>
+                <div class="checkbox col-xs-1">
                     <span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?php echo $this->lang->line('config_cash_decimals_tooltip'); ?>"></span>
                 </div>
             </div>
diff --git a/application/views/configs/mailchimp_config.php b/application/views/configs/mailchimp_config.php
index 1cd2d098b..cccfbfa73 100644
--- a/application/views/configs/mailchimp_config.php
+++ b/application/views/configs/mailchimp_config.php
@@ -16,6 +16,9 @@
 							'value' => $mailchimp['api_key'])); ?>
 					</div>
 				</div>
+				<div class="checkbox col-xs-1">
+					<a href="http://eepurl.com/b9a05b" target="_blank"><span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?php echo $this->lang->line('config_mailchimp_tooltip'); ?>"></span></a>
+				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
@@ -80,4 +83,4 @@ $(document).ready(function()
 		errorLabelContainer: '#mailchimp_error_message_box'
 	}));
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/database/3.0.2_to_3.1.0.sql b/database/3.0.2_to_3.1.0.sql
index 5427927d1..5352ef0cf 100644
--- a/database/3.0.2_to_3.1.0.sql
+++ b/database/3.0.2_to_3.1.0.sql
@@ -297,7 +297,7 @@ ALTER TABLE `ospos_customers`
   ADD CONSTRAINT `ospos_customers_ibfk_2` FOREIGN KEY (`package_id`) REFERENCES `ospos_customers_packages` (`package_id`);
 
 
--- add reCaptcha configuration
+-- add reCAPTCHA configuration
 
 INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
   ('gcaptcha_enable', '0'),