diff --git a/functions.php b/functions.php
index 41cfad4..631e8cf 100644
--- a/functions.php
+++ b/functions.php
@@ -23,7 +23,7 @@
  * Not working for theme if inside after_setup_theme function - so thats why it is here.
  * @since 1.7.0
  */
-require_once( get_stylesheet_directory() . '/includes-child/customizer-filtered.php' );
+require_once( get_stylesheet_directory() . '/includes-child/customizer-defaults.php' );
 
 
 add_action( 'after_setup_theme', 'bt_theme_setup', 15 );
@@ -40,7 +40,7 @@ function bt_theme_setup() {
 	 */
 	define( 'CHILD_THEME_NAME', 'beavertron' );
 	define( 'CHILD_THEME_URL', 'http://wpbeaches.com' );
-	define( 'CHILD_THEME_VERSION', '1.7.0' );
+	define( 'CHILD_THEME_VERSION', '1.7.1' );
 	define( 'FL_CHILD_THEME_DIR', get_stylesheet_directory() );
 	define( 'FL_CHILD_THEME_URL', get_stylesheet_directory_uri() );
 	// Allow SVG Upload
@@ -71,14 +71,15 @@ function bt_theme_setup() {
 	 * Add Customizer Options and CSS output.
 	 * @since 1.0.0
 	 */
-	require_once( get_stylesheet_directory() . '/includes-child/customizer.php' );
-	require_once( get_stylesheet_directory() . '/includes-child/output.php' );
+	require_once( get_stylesheet_directory() . '/includes-child/customizer-panels.php' );
+	require_once( get_stylesheet_directory() . '/includes-child/inline-css-style.php' );
+	require_once( get_stylesheet_directory() . '/includes-child/inline-css-style-login.php' );
 
 	/**
-	 * Client Logo for WP Login and backend admin clean up.
+	 * Client Logo for WP Login and backend dashboard admin clean up.
 	 * @since 1.0.0
 	 */
-	include_once( get_stylesheet_directory() . '/includes-child/client-file.php' );
+	include_once( get_stylesheet_directory() . '/includes-child/dashboard.php' );
 	
 	/**
 	 * Remove Default BB Mobile Menu.
diff --git a/includes-child/customizer-filtered.php b/includes-child/customizer-defaults.php
similarity index 100%
rename from includes-child/customizer-filtered.php
rename to includes-child/customizer-defaults.php
diff --git a/includes-child/customizer.php b/includes-child/customizer-panels.php
similarity index 89%
rename from includes-child/customizer.php
rename to includes-child/customizer-panels.php
index 30d4bb2..ca8e5ab 100644
--- a/includes-child/customizer.php
+++ b/includes-child/customizer-panels.php
@@ -444,7 +444,6 @@ function sanitize_text( $text ) {
 	 */
 	//$wp_customize->get_section( 'background_image' )->title = __( 'Background Styles', 'beavertron' );
 
-
 	/**
 	 *  Add WooCommerce Colors Section
 	 * @since 2.0.0
@@ -501,6 +500,158 @@ function sanitize_text( $text ) {
 	) );
 
 
+	/**
+	 * Create login panel
+	 * Add setting
+	 * Add control
+	 * Also can be done with FLCustomizer::add_panel - see example commented further down
+	 * @since 1.0.0
+	 */
+	// Add Panel
+	// $wp_customize->add_panel( 'login_page', array(
+	// 	'priority'       => 70,
+	// 	'theme_supports' => '',
+	// 	'title'          => __( 'Login', 'beavertron' ),
+	// 	'description'    => __( 'Set login page styles', 'beavertron' ),
+	// ) );
+
+	// Add Login Styles
+	// Add in Settings section with 'fl-settings'.
+	$wp_customize->add_section( 'bt_login_styles' , array(
+		'title'      => __( 'Login Styles','beavertron' ),
+		'panel'      => 'fl-settings',
+		'priority'   => 120,
+		) 
+	);
+
+	$wp_customize->add_setting( 'bt_login_accent_color', array(
+			'default' => '#007cba', // Give it a default
+		)
+	);
+
+	$wp_customize->add_control( new WP_Customize_Color_Control(
+		$wp_customize,
+		'bt_login_custom_accent_color', //give it an ID
+		   array(
+			   'label'      => __( 'Login accent color', 'beavertron' ), //set the label to appear in the Customizer
+			   'section'    => 'bt_login_styles', //select the section for it to appear under  
+			   'settings'   => 'bt_login_accent_color' //pick the setting it applies to
+		   )
+	   )
+	);
+
+	$wp_customize->add_setting( 'bt_login_accent_hover_color', array(
+			'default' => '#0071a1', // Give it a default
+		)
+	);
+
+	$wp_customize->add_control( new WP_Customize_Color_Control(
+		$wp_customize,
+		'bt_login_custom_accent_hover_color', //give it an ID
+			array(
+					'label'      => __( 'Login accent hover color', 'beavertron' ), //set the label to appear in the Customizer
+					'section'    => 'bt_login_styles', //select the section for it to appear under  
+					'settings'   => 'bt_login_accent_hover_color' //pick the setting it applies to
+				)
+			)
+	);
+
+	$wp_customize->add_setting( 'bt_login_link_color', array(
+		'default' => '#555d66', // Give it a default
+		)
+	);
+
+	$wp_customize->add_control( new WP_Customize_Color_Control(
+		$wp_customize,
+		'bt_login_custom_link_color', //give it an ID
+			array(
+				'label'      => __( 'Login link color', 'beavertron' ), //set the label to appear in the Customizer
+				'section'    => 'bt_login_styles', //select the section for it to appear under  
+				'settings'   => 'bt_login_link_color' //pick the setting it applies to
+			)
+		)
+	);
+
+	$wp_customize->add_setting( 'bt_login_link_hover_color', array(
+			'default' => '#00a0d2', // Give it a default
+		)
+	);
+
+	$wp_customize->add_control( new WP_Customize_Color_Control(
+		$wp_customize,
+		'bt_login_custom_link_hover_color', //give it an ID
+			array(
+				'label'      => __( 'Login link hover color', 'beavertron' ), //set the label to appear in the Customizer
+				'section'    => 'bt_login_styles', //select the section for it to appear under  
+				'settings'   => 'bt_login_link_hover_color' //pick the setting it applies to
+			)
+		)
+	);
+
+	$wp_customize->add_setting( 'bt_login_background_color', array(
+		'default' => '#f1f1f1', // Give it a default
+		)
+	);
+
+	$wp_customize->add_control( new WP_Customize_Color_Control(
+		$wp_customize,
+		'bt_login_custom_background_color', //give it an ID
+			array(
+				'label'      => __( 'Login background color', 'beavertron' ), //set the label to appear in the Customizer
+				'section'    => 'bt_login_styles', //select the section for it to appear under  
+				'settings'   => 'bt_login_background_color' //pick the setting it applies to
+			)
+		)
+	);	
+
+	$wp_customize->add_setting( 'bt_login_form_color', array(
+		'default' => '#ffffff', // Give it a default
+		)
+	);
+
+	$wp_customize->add_control( new WP_Customize_Color_Control(
+		$wp_customize,
+		'bt_login_form_color', //give it an ID
+			array(
+				'label'      => __( 'Login form background color', 'beavertron' ), //set the label to appear in the Customizer
+				'section'    => 'bt_login_styles', //select the section for it to appear under  
+				'settings'   => 'bt_login_form_color' //pick the setting it applies to
+			)
+		)
+	);
+
+	$wp_customize->add_setting( 'bt_login_form_text', array(
+		'default' => '#444444', // Give it a default
+		)
+	);
+
+	$wp_customize->add_control( new WP_Customize_Color_Control(
+		$wp_customize,
+		'bt_login_form_text', //give it an ID
+			array(
+				'label'      => __( 'Login form text color', 'beavertron' ), //set the label to appear in the Customizer
+				'section'    => 'bt_login_styles', //select the section for it to appear under  
+				'settings'   => 'bt_login_form_text' //pick the setting it applies to
+			)
+		)
+	);
+
+	$wp_customize->add_setting( 'bt_admin_font',
+		array(
+		'default' => 0,
+		)
+	);
+	
+	$wp_customize->add_control( 'bt_admin_font',
+		array(
+		'label' => __( 'Make WP Dashboard font same as frontend' ),
+		'section' => 'bt_login_styles',
+		'priority' => 10, // Optional. Order priority to load the control. Default: 10
+		'type' => 'checkbox',
+		)
+	);
+
+
 	/**
 	 * Remove Panels and Sections by uncommenting.
 	 * Create Custom Section
@@ -706,7 +857,7 @@ function sanitize_text( $text ) {
 
 add_filter( 'fl_default_theme_mods', 'bt_default_theme_preset');
 /** 
- *  Sey Active Preset Theme Mods
+ *  Set Active Preset Theme Mods
  *  @since 1.0.0
  */
 function bt_default_theme_preset( $mods ) {
@@ -829,7 +980,7 @@ function bt_default_theme_preset( $mods ) {
 //add_action( 'after_setup_theme', 'bt_add_customizer_panel', 35 );
 /**
  * Create Custom Customizer Panel with FLCustomizer::add_panel
- * 7 Panel Examples with a range of controls
+ * 7 Panel Examples with a range of controls ... informational
  * @since 1.7.0
  */
 function bt_add_customizer_panel() {
@@ -1098,5 +1249,5 @@ function bt_add_customizer_panel() {
             $data = FLTheme::get_setting('bt-body-bg-color');
 
 
-            var_dump ($data);   
+          //  var_dump ($data);   
 }
\ No newline at end of file
diff --git a/includes-child/client-file.php b/includes-child/dashboard.php
similarity index 86%
rename from includes-child/client-file.php
rename to includes-child/dashboard.php
index 3e8db8c..07fe1a8 100644
--- a/includes-child/client-file.php
+++ b/includes-child/dashboard.php
@@ -8,21 +8,6 @@
  * @link    http://wpbeaches.com/
  */
 
-
-
-add_action( 'login_head', 'bt_custom_login_logo' );
-/**
- * Client Logo for Backend Login - Home link and Image Description
- *
- * @since 1.0.0
- */
-function bt_custom_login_logo() {
-	echo '<style type="text/css">
-            .login h1 a { background-image:url(' . get_stylesheet_directory_uri() . '/images/logo.png) !important; width: 260px; !important; height: 60px !important; background-size: 100% 100% !important; margin-bottom: 60px !important;}
-            .login form {margin-top: -50px;}
-        </style>';
-}
-
 add_filter( 'login_headerurl', 'bt_custom_login_url', 10, 4 );
 /**
  * Logo Backend Home link
@@ -77,10 +62,18 @@ function bt_remove_dashboard_widgets() {
 	// remove_meta_box('dashboard_activity','dashboard', 'normal'); //Activity
 	remove_action( 'welcome_panel','wp_welcome_panel' );
 	remove_action( 'try_gutenberg_panel', 'wp_try_gutenberg_panel'); // Try Gutenberg
-
+	remove_meta_box( 'dashboard_site_health', 'dashboard', 'normal' ); // Remove Site Health Widget
 }
 
 
+add_filter( 'wp_fatal_error_handler_enabled', '__return_false' );
+/**
+ *  Stop Site Health Emails from beng sent to Admin
+ *
+ * @since 1.0.0
+ */
+
+ 
 add_action( 'admin_head', 'bt_hide_tabs' );
 /**
  *  Hide 'Screen Option' and 'Help' tab for non-Admins
@@ -118,12 +111,6 @@ function wsl_edit_text() {
     return "<em>Site by <a href='https://websitelove.com.au' rel='nofollow'>WebsiteLove</a>, contact <a href='mailto:support@websitelove.com.au' rel='nofollow'>us</a></em>";
 }
 
-/**
- *  Stop Site Health Emails from beng sent to Admin
- *
- * @since 1.0.0
- */
-add_filter( 'wp_fatal_error_handler_enabled', '__return_false' );
 
 
 /**
diff --git a/includes-child/inline-css-style-login.php b/includes-child/inline-css-style-login.php
new file mode 100644
index 0000000..10b1a8f
--- /dev/null
+++ b/includes-child/inline-css-style-login.php
@@ -0,0 +1,252 @@
+<?php
+
+add_action( 'login_enqueue_scripts', 'bt_css_inline_login', 1009 );
+/**
+ * Inline Style for login css
+ *
+ * @since 1.7.1
+ */
+function bt_css_inline_login() {
+	// Passing inline CSS straight after the login CSS
+	$handle  = 'login';
+	// $handle  = 'fl-automator-skin';
+	/* Our Customiser settings, stored as variables */
+	$hero_bg_image = get_theme_mod( 'hero_bg');
+	$login_color = get_theme_mod( 'bt_login_accent_color');
+	$login_hover_color = get_theme_mod( 'bt_login_accent_hover_color');
+	$login_background_color = get_theme_mod( 'bt_login_background_color');
+	$login_link_color = get_theme_mod( 'bt_login_link_color');
+	$login_link_hover_color = get_theme_mod( 'bt_login_link_hover_color');
+	$login_form_color = get_theme_mod( 'bt_login_form_color');
+	$login_form_text_color = get_theme_mod( 'bt_login_form_text');
+	
+	// Getting the default WP custom logo - 4 keys in the array - url[0], width[1], height[2] and a boolean[3]
+	$custom_logo_id  = wp_get_attachment_image_src( get_theme_mod( 'custom_logo' ), 'full' );
+	$custom_logo_url = $custom_logo_id [0];
+	$custom_logo_width = $custom_logo_id [1];
+	$custom_logo_height = $custom_logo_id [2];
+	$font_login = FLTheme::get_setting( 'fl-body-font-family' );
+	
+	/* Start off with •nuffink */
+	$css = '';
+
+	$css .= ( !empty($custom_logo_url) ) ? sprintf('
+	.login h1 a { 
+		background-image: url(%s);
+		width: 300px !important;
+		height: 100px !important;
+		background-size: contain;
+		background-position: center;
+	}
+
+	.login .message, 
+	.login .success, 
+	.login #login_error {
+		line-height: 1.8;
+    	padding-bottom: 10px;
+	}
+	', $custom_logo_url) : '';
+	
+
+	$css .= ( !empty($login_color) ) ? sprintf('
+		body {
+			background: %3$s;
+			font-family: %4$s;
+		}
+
+		.wp-core-ui .button-primary {
+			background: %1$s;
+			border-color: %1$s;
+		}
+	
+		.wp-core-ui .button-primary.focus, 
+		.wp-core-ui .button-primary.hover, 
+		.wp-core-ui .button-primary:focus, 
+		.wp-core-ui .button-primary:hover {
+			background: %2$s;
+			border-color: %2$s;
+			color: #fff;
+			opacity: .8;
+		}
+
+		.wp-core-ui .button, 
+		.wp-core-ui .button-secondary {
+			color: #fff;
+			border-color: %1$s;
+			background: %1$s;
+		}
+
+		.wp-core-ui .button-secondary:hover, 
+		.wp-core-ui .button.hover
+		.wp-core-ui .button-secondary:focus, 
+		.wp-core-ui .button.focus {
+			border-color: %2$s;
+			color: #fff;
+		}
+
+		.login .button.wp-hide-pw {
+			color: %1$s;
+		}
+
+		.login .button.wp-hide-pw:hover,
+		.login .button.wp-hide-pw:focus {
+			color: %2$s;
+			border-color: %2$s;
+			box-shadow: 0 0 0 1px %2$s;
+		}
+
+		input[type="text"], 
+		input[type="password"], 
+		input[type="color"], 
+		input[type="date"], 
+		input[type="datetime"], 
+		input[type="datetime-local"], 
+		input[type="email"], 
+		input[type="month"], 
+		input[type="number"], 
+		input[type="search"], 
+		input[type="tel"], 
+		input[type="time"], 
+		input[type="url"], 
+		input[type="week"], 
+		select, 
+		textarea {
+		    border: 1px solid %1$s;
+		}
+
+		input[type=checkbox]:focus, 
+		input[type=color]:focus, 
+		input[type=date]:focus, 
+		input[type=datetime-local]:focus, 
+		input[type=datetime]:focus, 
+		input[type=email]:focus, 
+		input[type=month]:focus, 
+		input[type=number]:focus, 
+		input[type=password]:focus, 
+		input[type=radio]:focus, 
+		input[type=search]:focus, 
+		input[type=tel]:focus, 
+		input[type=text]:focus, 
+		input[type=time]:focus, 
+		input[type=url]:focus, 
+		input[type=week]:focus, 
+		select:focus, 
+		textarea:focus {
+			border-color: %1$s;
+			box-shadow: 0 0 0 1px %1$s;
+			border: 1px solid %1$s;
+		}
+
+		.login .message,
+		.login .success,
+		.login #login_error {
+			border-left: 4px solid %1$s;
+		}
+
+		.login form {
+			color: %5$s;
+			background: %6$s;
+		}
+	', $login_color, $login_hover_color, $login_background_color, $font_login, $login_form_text_color, $login_form_color ) : '';
+
+
+	$css .= ( !empty($login_link_color) ) ? sprintf('
+		a {
+			color: %1$s;
+		}
+		a:hover {
+			color: %1$s;
+			opacity: .8;
+		}
+
+		.login #nav a, 
+		.login #backtoblog a {
+			color: %1$s;
+		}
+
+		.login #backtoblog a:hover, 
+		.login #nav a:hover, 
+		.login h1 a:hover {
+			color:%2$s;
+			opacity: .8;
+		}
+	', $login_link_color, $login_link_hover_color ) : '';
+
+	if ( $css ) {
+		wp_add_inline_style( $handle, $css );
+	}
+}
+
+
+
+
+add_action( 'admin_enqueue_scripts', 'bt_css_inline_admin_common', 1009 );
+/**
+ * Inline Style for admin css Common
+ *
+ * @since 1.7.1
+ */
+
+function bt_css_inline_admin_common() {
+
+	$admin_font = get_theme_mod( 'bt_admin_font');
+
+	/* Start off with •nuffink */
+	$css = '';
+
+	if ($admin_font == 1) {
+	
+		// Passing inline CSS straight after the login CSS
+		$handle  = 'common';
+
+		$font_login = FLTheme::get_setting( 'fl-body-font-family' );
+		
+		$css .= ( !empty($font_login) ) ? sprintf('
+			body {
+				font-family: %s;
+			}
+		', $font_login ) : '';
+
+	}
+
+	if ( $css ) {
+		wp_add_inline_style( $handle, $css );
+	}
+}
+
+
+
+add_action( 'admin_enqueue_scripts', 'bt_css_inline_admin_bar', 1009 );
+/**
+ * Inline Style for admin css Common
+ *
+ * @since 1.7.1
+ */
+
+function bt_css_inline_admin_bar() {
+
+	$admin_font = get_theme_mod( 'bt_admin_font');
+
+	/* Start off with •nuffink */
+	$css = '';
+
+	if ($admin_font == 1) {
+		// Passing inline CSS straight after the login CSS
+		$handle  = 'admin-bar';
+
+		$font_login = FLTheme::get_setting( 'fl-body-font-family' );
+
+		/* Start off with •nuffink */
+		$css = '';
+		
+		$css .= ( !empty($font_login) ) ? sprintf('
+		#wpadminbar * {
+				font-family: %s;
+			}
+		', $font_login ) : '';
+	}
+
+	if ( $css ) {
+		wp_add_inline_style( $handle, $css );
+	}
+}
\ No newline at end of file
diff --git a/includes-child/output.php b/includes-child/inline-css-style.php
similarity index 99%
rename from includes-child/output.php
rename to includes-child/inline-css-style.php
index 49146b7..0afba8e 100644
--- a/includes-child/output.php
+++ b/includes-child/inline-css-style.php
@@ -321,4 +321,4 @@ function bt_color_brightness( $color, $change ) {
 	}
 
 
-}
+}
\ No newline at end of file
diff --git a/includes-child/woocommerce/customize-woo.php b/includes-child/woocommerce/customizer-woo.php
similarity index 99%
rename from includes-child/woocommerce/customize-woo.php
rename to includes-child/woocommerce/customizer-woo.php
index 521b619..77e9381 100644
--- a/includes-child/woocommerce/customize-woo.php
+++ b/includes-child/woocommerce/customizer-woo.php
@@ -4,6 +4,7 @@
  * @since 1.0.0
  * @package beavertron
  */
+
  /**
   * Set Up Default Colors - so if not changed in Customizer no CSS mark up is output
   * @since 1.0.0
diff --git a/includes-child/woocommerce/woo.css b/includes-child/woocommerce/woo.css
index 971384c..13c5eac 100644
--- a/includes-child/woocommerce/woo.css
+++ b/includes-child/woocommerce/woo.css
@@ -135,7 +135,7 @@
 .woocommerce-page .related ul.products li.product {
 	width: 49%;
 }
-@media (min-width: 767px) {
+@media (min-width: 768px) {
 	.woocommerce-page .related ul.products li.product {
 		width: 30.8%;
 		padding: 2%;
@@ -145,4 +145,15 @@
 
 .sku_wrapper {
 	display: none;
+}
+
+/* Reduce table padding on small devices */
+@media (max-width: 767px) {
+	.woocommerce table.shop_table th, 
+	.woocommerce-page table.shop_table th, 
+	.woocommerce table.shop_table td, 
+	.woocommerce-page table.shop_table td {
+		border-color: #e6e6e6 !important;
+		padding: 10px !important;
+	}
 }
\ No newline at end of file
diff --git a/includes-child/woocommerce/woocommerce.php b/includes-child/woocommerce/woocommerce.php
index 783d75c..4f338f2 100644
--- a/includes-child/woocommerce/woocommerce.php
+++ b/includes-child/woocommerce/woocommerce.php
@@ -14,7 +14,7 @@ function woo_css_styles() {
  * WOO Customizer Options
  * @since 1.0.0
  */
-include_once( get_stylesheet_directory() . '/includes-child/woocommerce/customize-woo.php' );
+include_once( get_stylesheet_directory() . '/includes-child/woocommerce/customizer-woo.php' );
 
 
 add_action( 'template_redirect', 'bt_remove_woocommerce_styles_scripts', 999 );
diff --git a/plugins.php b/plugins.php
index 34681d9..7aec7d5 100644
--- a/plugins.php
+++ b/plugins.php
@@ -285,9 +285,14 @@ function gsm_register_required_plugins() {
 					 'required' => false,
 			 ),
 			 array(
-					 'name'     => 'SlickNav Mobile Menu',
-					 'slug'     => 'slicknav-mobile-menu',
-					 'required' => false,
+					'name'     => 'Shortcode in Menus',
+					'slug'     => 'shortcode-in-menus',
+					'required' => false,
+			),
+			 array(
+					'name'     => 'SlickNav Mobile Menu',
+					'slug'     => 'slicknav-mobile-menu',
+					'required' => false,
 			 ),
 			 array(
 					 'name'     => 'Smoothscroller',