diff --git a/admin/options.php b/admin/options.php
index 6c94839..454e5a4 100644
--- a/admin/options.php
+++ b/admin/options.php
@@ -1,333 +1 @@
-<?php if (__FILE__ == $_SERVER['SCRIPT_FILENAME']) { exit; }
-
-add_action('admin_menu', 'aquila_add_admin_menu');
-add_action('admin_init', 'aquila_settings_init');
-
-function aquila_add_admin_menu() { 
-	add_submenu_page(
-		'options-general.php', 
-		__('Aquila Settings', 'aquila-admin-theme'), 
-		'<i class="aquila-aquila" style="font-size: 140%;float: right;line-height: 1;"></i>  ' . __('Aquila', 'aquila-admin-theme'), 
-		'manage_options', 
-		'aquilaSettings', 
-		'aquila_options_page'
-	);
-}
-
-function aquila_settings_init() { 
-	register_setting('aquilaGeneralSettings', 'aquila_settings');
-
-	add_settings_section(
-		'aquila_aquilaGeneralSettings_section', 
-		__('Aquila Settings', 'aquila-admin-theme'), 
-		'aquilaGeneralCallback', 
-		'aquilaGeneralSettings'
-	);
-
-	add_settings_field(
-		'aquila_chk_abLinks', 
-		__('Show <strong>Adminbar</strong> links?', 'aquila-admin-theme'), 
-		'aquila_chk_abLinks_render', 
-		'aquilaGeneralSettings', 
-		'aquila_aquilaGeneralSettings_section' 
-	);
-
-	add_settings_field(
-		'aquila_chk_pluginSupport', 
-		__('Show Editors <strong>Plugins Support</strong> metabox?', 'aquila-admin-theme'), 
-		'aquila_chk_pluginSupport_render', 
-		'aquilaGeneralSettings', 
-		'aquila_aquilaGeneralSettings_section' 
-	);
-
-	add_settings_field(
-		'aquila_chk_dashBoxes', 
-		__('Show all other <strong>Dashboard metaboxes</strong>?', 'aquila-admin-theme'), 
-		'aquila_chk_dashBoxes_render', 
-		'aquilaGeneralSettings', 
-		'aquila_aquilaGeneralSettings_section' 
-	);
-
-	add_settings_field(
-		'aquila_chk_postBlog', 
-		__('Do not rename <strong>Posts</strong> to <strong>Blog</strong>', 'aquila-admin-theme'), 
-		'aquila_chk_postBlog_render', 
-		'aquilaGeneralSettings', 
-		'aquila_aquilaGeneralSettings_section' 
-	);
-
-	add_settings_field(
-		'aquila_chk_hideFooter', 
-		__('Hide <strong>Footer credit</strong> link.', 'aquila-admin-theme'), 
-		'aquila_chk_hideFooter_render', 
-		'aquilaGeneralSettings', 
-		'aquila_aquilaGeneralSettings_section' 
-	);
-
-	add_settings_field(
-		'aquila_chk_showNag', 
-		__('Show <strong>WordPress Update</strong> notices.', 'aquila-admin-theme'), 
-		'aquila_chk_showNag_render', 
-		'aquilaGeneralSettings', 
-		'aquila_aquilaGeneralSettings_section' 
-	);
-
-	// Custom Logo
-	register_setting('aquilaLogoSettings', 'aquilaLogoSettings');
-
-	add_settings_section(
-		'aquila_aquilaLogoSettings_section', 
-		__('Custom Logo', 'aquila-admin-theme'), 
-		'aquilaLogoCallback', 
-		'aquilaLogoSettings'
-	);
-
-	add_settings_field(
-		'aquila_new_logo', 
-		__('Custom logo', 'aquila-admin-theme'), 
-		'aquila_new_logo_render', 
-		'aquilaLogoSettings', 
-		'aquila_aquilaLogoSettings_section' 
-	);
-
-	add_settings_field(
-		'aquila_new_logo_sqr', 
-		__('Custom logo (square) <br/><em>Used in the "folded" menu</em>', 'aquila-admin-theme'), 
-		'aquila_new_logo_sqr_render', 
-		'aquilaLogoSettings', 
-		'aquila_aquilaLogoSettings_section' 
-	);
-
-
-	// Colour Scheme
-	register_setting('aquilaColourSettings', 'aquilaColourSettings');
-
-	add_settings_section(
-		'aquila_aquilaColourSettings_section', 
-		__('Color Scheme', 'aquila-admin-theme'), 
-		'aquilaColourCallback', 
-		'aquilaColourSettings'
-	);
-
-	add_settings_field(
-		'aquila_primary_colour', 
-		__('Primary Color', 'aquila-admin-theme'), 
-		'aquila_primary_colour_render', 
-		'aquilaColourSettings', 
-		'aquila_aquilaColourSettings_section' 
-	);
-
-	add_settings_field(
-		'aquila_secondary_colour', 
-		__('Secondary Color', 'aquila-admin-theme'), 
-		'aquila_secondary_colour_render', 
-		'aquilaColourSettings', 
-		'aquila_aquilaColourSettings_section' 
-	);
-
-	add_settings_field(
-		'aquila_menu_back_colour', 
-		__('Menu Background Color', 'aquila-admin-theme'), 
-		'aquila_menu_back_colour_render', 
-		'aquilaColourSettings', 
-		'aquila_aquilaColourSettings_section' 
-	);
-}
-
-function aquila_chk_abLinks_render() { 
-	$options = get_option('aquila_settings');
-	if (isset($options['aquila_chk_abLinks'])) { 
-		$aquilaABLinks = $options['aquila_chk_abLinks'];
-	} else { 
-		$aquilaABLinks = 0; 
-	};
-	?>
-	<input type='checkbox' name='aquila_settings[aquila_chk_abLinks]' <?php checked($aquilaABLinks, 1); ?> value='1'>
-	<?php
-}
-
-
-function aquila_chk_pluginSupport_render() { 
-	$options = get_option('aquila_settings');
-	if (isset($options['aquila_chk_pluginSupport'])) { 
-		$aquilaPluginSupport = $options['aquila_chk_pluginSupport']; 
-	} else { 
-		$aquilaPluginSupport = 0; 
-	};
-	?>
-	<input type='checkbox' name='aquila_settings[aquila_chk_pluginSupport]' <?php checked($aquilaPluginSupport, 1); ?> value='1'>
-	<?php
-}
-
-function aquila_chk_dashBoxes_render() { 
-	$options = get_option('aquila_settings');
-	if (isset($options['aquila_chk_dashBoxes'])) { 
-		$aquilaDashBoxes = $options['aquila_chk_dashBoxes']; 
-	} else { 
-		$aquilaDashBoxes = 0; 
-	};
-	?>
-	<input type='checkbox' name='aquila_settings[aquila_chk_dashBoxes]' <?php checked($aquilaDashBoxes, 1); ?> value='1'>
-	<?php
-}
-
-function aquila_chk_postBlog_render() { 
-	$options = get_option('aquila_settings');
-	if (isset($options['aquila_chk_postBlog'])) { 
-		$aquilaPostBlog = $options['aquila_chk_postBlog']; 
-	} else { 
-		$aquilaPostBlog = 0; 
-	};
-	?>
-	<input type='checkbox' name='aquila_settings[aquila_chk_postBlog]' <?php checked($aquilaPostBlog, 1); ?> value='1'>
-	<?php
-}
-
-function aquila_chk_hideFooter_render() { 
-	$options = get_option('aquila_settings');
-	if (isset($options['aquila_chk_hideFooter'])) { 
-		$aquilaHideFooter = $options['aquila_chk_hideFooter']; 
-	} else { 
-		$aquilaHideFooter = 0; 
-	};
-	?>
-	<input type='checkbox' name='aquila_settings[aquila_chk_hideFooter]' <?php checked($aquilaHideFooter, 1); ?> value='1'>
-	<?php
-}
-
-function aquila_chk_showNag_render() { 
-	$options = get_option('aquila_settings');
-	if (isset($options['aquila_chk_showNag'])) { 
-		$aquilaShowNag = $options['aquila_chk_showNag'];
-	} else { 
-		$aquilaShowNag = 0; 
-	};
-	?>
-	<input type='checkbox' name='aquila_settings[aquila_chk_showNag]' <?php checked($aquilaShowNag, 1); ?> value='1'>
-	<?php
-}
-
-function aquila_new_logo_render() { 
-	$options = get_option('aquilaLogoSettings');
-	if (isset($options['aquila_new_logo'])) { 
-		$aquilaNewLogo = $options['aquila_new_logo']; 
-	} else { 
-		$aquilaNewLogo = 'none'; 
-	};
-	?>
-
-	<input class="aquilaNewLogoUrl" id="" type="text" name="aquilaLogoSettings[aquila_new_logo]" value="<?php echo $aquilaNewLogo; ?>" style="margin-bottom:10px; clear:right; display: none;">
-	<a href="#" class="button aquilaNewLogoUpload"><?php _e('Upload logo', 'aquila-admin-theme'); ?></a>
-	<a href="#" class="button aquilaNewLogoClear"><?php _e('Remove logo', 'aquila-admin-theme'); ?></a>
-	<img class="aquilaOptionsLogo aquila_new_logo" src="<?php echo $aquilaNewLogo; ?>" />
-	<?php echo wp_get_attachment_url(get_option('media_selector_attachment_id'));
-}
-
-function aquila_new_logo_sqr_render() { 
-	$options = get_option('aquilaLogoSettings');
-	if (isset($options['aquila_new_logo_sqr'])) { 
-		$aquilaNewLogoSqr = $options['aquila_new_logo_sqr']; 
-	} else { 
-		$aquilaNewLogoSqr = 'none'; 
-	};
-	?>
-
-	<input class="aquilaNewLogoUrl" id="" type="text" name="aquilaLogoSettings[aquila_new_logo_sqr]" value="<?php echo $aquilaNewLogoSqr; ?>" style="margin-bottom:10px; clear:right; display: none;">
-	<a href="#" class="button aquilaNewLogoUpload"><?php _e('Upload logo', 'aquila-admin-theme'); ?></a>
-	<a href="#" class="button aquilaNewLogoClear"><?php _e('Remove logo', 'aquila-admin-theme'); ?></a>
-	<img class="aquilaOptionsLogo aquila_new_logo" src="<?php echo $aquilaNewLogoSqr; ?>" />
-	<?php echo wp_get_attachment_url(get_option('media_selector_attachment_id'));
-}
-
-// Colour Pickers
-function aquila_primary_colour_render() {
-	$options = get_option('aquilaColourSettings');
-	if (isset($options['aquila_primary_colour']) && ($options['aquila_primary_colour'] !== '')) { 
-		$aquilaPrimaryColour = $options['aquila_primary_colour']; 
-	} else { 
-		$aquilaPrimaryColour = '#039be5'; 
-	};
-	?>
-
-	<input type="text" class="colourPicker" name="aquilaColourSettings[aquila_primary_colour]" id='colourPicker1' value="<?php echo $aquilaPrimaryColour; ?>" />
-	<?php
-}
-
-function aquila_secondary_colour_render() {
-	$options = get_option('aquilaColourSettings');
-	if (isset ($options['aquila_secondary_colour']) && ($options['aquila_secondary_colour'] !== '')) { 
-		$aquilaSecondaryColour = $options['aquila_secondary_colour']; 
-	} else { 
-		$aquilaSecondaryColour = '#ffeb3b'; 
-	};
-	?>
-
-	<input type="text" class="colourPicker" name="aquilaColourSettings[aquila_secondary_colour]" id='colourPicker2' value="<?php echo $aquilaSecondaryColour; ?>" />
-	<?php
-}
-
-function aquila_menu_back_colour_render() {
-	$options = get_option('aquilaColourSettings');
-	if (isset ($options['aquila_menu_back_colour']) && ($options['aquila_menu_back_colour'] !== '')) { 
-		$aquilaMenuBackColour = $options['aquila_menu_back_colour']; 
-	} else { 
-		$aquilaMenuBackColour = '#212121'; 
-	};
-	?>
-
-	<input type="text" class="colourPicker" name="aquilaColourSettings[aquila_menu_back_colour]" id='colourPicker2' value="<?php echo $aquilaMenuBackColour; ?>" />
-	<?php
-}
-
-function aquilaGeneralCallback() { 
-	echo __('General changes to your admin area.', 'aquila-admin-theme');
-}
-
-function aquilaLogoCallback() { 
-	echo __('Choose a custom logo for your admin area.', 'aquila-admin-theme');
-}
-
-function aquilaColourCallback() { 
-	echo __('Select a new color scheme for the admin area.', 'aquila-admin-theme');
-}
-
-function aquila_options_page() { 	?>
-	<div class="wrap">
-
-    <h2><?php _e('Aquila Settings', 'aquila-admin-theme'); ?></h2>
-
-    <?php $active_tab = isset($_GET['tab']) ? $_GET['tab'] : 'generalSettings'; ?>
-     
-    <h2 class="nav-tab-wrapper">
-			<a href="?page=aquilaSettings&tab=generalSettings" class="nav-tab <?php echo $active_tab == 'generalSettings' ? 'nav-tab-active' : ''; ?>"><?php _e('General Settings', 'aquila-admin-theme'); ?></a>
-			<a href="?page=aquilaSettings&tab=logoSettings" class="nav-tab <?php echo $active_tab == 'logoSettings' ? 'nav-tab-active' : ''; ?>"><?php _e('Custom Logo', 'aquila-admin-theme'); ?></a>
-			<a href="?page=aquilaSettings&tab=colourSettings" class="nav-tab <?php echo $active_tab == 'colourSettings' ? 'nav-tab-active' : ''; ?>"><?php _e('Color Scheme', 'aquila-admin-theme'); ?></a>
-    </h2>
-
-		<form action='options.php' method='post' class='aquilaSettingsPage'>
-	 
-	    <?php 
-        if($active_tab == 'generalSettings') {
-          settings_fields('aquilaGeneralSettings');
-          do_settings_sections('aquilaGeneralSettings');
-          submit_button();
-        } elseif ($active_tab == 'logoSettings') {
-          settings_fields('aquilaLogoSettings');
-          do_settings_sections('aquilaLogoSettings');
-          submit_button();
-        } elseif ($active_tab == 'colourSettings') {
-          settings_fields('aquilaColourSettings');
-          do_settings_sections('aquilaColourSettings');
-					submit_button();
-        } else {
-          settings_fields('aquilaGeneralSettings');
-          do_settings_sections('aquilaGeneralSettings');
-        	submit_button();
-        }
-	    ?>
-             
-		</form>
-	</div>
-
-	<?php
-}
+<?php if (__FILE__ == $_SERVER['SCRIPT_FILENAME']) { exit; }
\ No newline at end of file
diff --git a/admin/options/helpers.php b/admin/options/helpers.php
index dad13fc..839d91f 100644
--- a/admin/options/helpers.php
+++ b/admin/options/helpers.php
@@ -16,18 +16,19 @@ function aquila_checkbox($optionGroup, $optionName, $helpText) {
 function aquila_img_upload($optionGroup, $optionName) {
 	$options = get_option($optionGroup);
 	$aquilaColourSettings = get_option('aquilaColourSettings');
-	//$aquilaPrimary = $aquilaColourSettings['aquila_primary_colour'];
-	//$aquilaSecondary = $aquilaColourSettings['aquila_secondary_colour'];
 	$aquilaMenuBack = $aquilaColourSettings['aquila_menu_back_colour'] ?? '#212121';
 	if (isset($options[$optionName])) { 
 		$imgSrc = $options[$optionName]; 
 	} else { 
-		$imgSrc = 'none'; 
+		$imgSrc = null; 
 	};
 	echo '<input class="aquilaNewLogoUrl" type="text" name="'. $optionGroup .'['. $optionName .']" value="'. $imgSrc .'" style="margin-bottom:10px; clear:right; display: none;">
-	<a href="#" class="button aquilaNewLogoUpload">'. __( 'Upload logo', 'aquila-admin-theme' ) .'</a>
-	<a href="#" class="button aquilaNewLogoClear">'. __( 'Remove logo', 'aquila-admin-theme' ) .'</a>
-	<img style="background-color: '. $aquilaMenuBack .';" class="aquilaOptionsLogo '. $optionName .'" src="'. $imgSrc .'" />';
+	<a href="#" class="button aquilaNewLogoUpload">'. __( 'Upload logo', 'aquila-admin-theme' ) .'</a>';
+
+	if (!!$options && !!$imgSrc) {
+		echo '<a href="#" class="button aquilaNewLogoClear">'. __( 'Remove logo', 'aquila-admin-theme' ) .'</a>';
+	}
+	echo '<img style="background-color: '. $aquilaMenuBack .';" class="aquilaOptionsLogo '. $optionName .'" src="'. $imgSrc .'" />';
 	echo wp_get_attachment_url(get_option('media_selector_attachment_id'));
 }
 
diff --git a/aquila-admin-theme.php b/aquila-admin-theme.php
index 7e90ff5..ea5d93c 100644
--- a/aquila-admin-theme.php
+++ b/aquila-admin-theme.php
@@ -5,7 +5,7 @@
  * Description: The Aquila Admin Theme
  * Author: Guy Primavera
  * Author URI: https://guyprimavera.com/
- * Version: 3.1
+ * Version: 3.1.1
  * Text Domain: aquila-admin-theme
  * Domain Path: /lang/
  * License: GPL2
diff --git a/css/adminBar.css b/css/adminBar.css
index fc706cf..de60ccf 100644
--- a/css/adminBar.css
+++ b/css/adminBar.css
@@ -182,6 +182,11 @@ body.admin-bar #wpadminbar .noticon {
   display: none;
   padding-left: 0px;
 }
+@media screen and (max-width: 782px) {
+  .aquilaFront #wpadminbar {
+    padding-left: 50px;
+  }
+}
 .aquilaShowBarDefault.aquilaFront #wpadminbar {
   padding-left: 0px;
 }
@@ -323,8 +328,15 @@ body.admin-bar #wpadminbar .noticon {
     height: 46px;
   }
 }
-#wpadminbar #wp-admin-bar-site-name > .ab-item:before {
-  display: none!important;
+@media screen and (max-width: 782px) {
+  #wpadminbar #wp-admin-bar-site-name > .ab-item {
+    font-size: 0;
+  }
+}
+@media screen and (min-width: 783px) {
+  #wpadminbar #wp-admin-bar-site-name > .ab-item:before {
+    display: none!important;
+  }
 }
 #wpadminbar li#wp-admin-bar-wp-logo {
   margin-right: 20px!important;
diff --git a/css/adminBar.less b/css/adminBar.less
index 52d69b0..28e350d 100644
--- a/css/adminBar.less
+++ b/css/adminBar.less
@@ -33,6 +33,10 @@ body.admin-bar {
 		display: none;
 		padding-left: 0px;
 
+		@media screen and (max-width: 782px) {
+			padding-left: 50px;
+		}
+
 		.aquilaShowBarDefault& {
 			padding-left: 0px;
 		}
@@ -192,8 +196,15 @@ body.admin-bar {
 
 	#wp-admin-bar-site-name>.ab-item {
 
-		&:before {
-			.dNI;
+		@media screen and (max-width: 782px) {
+			font-size: 0;
+		}
+
+		@media screen and (min-width: 783px) {
+
+			&:before {
+				.dNI;
+			}
 		}
 	}
 
diff --git a/login/aquila-login-screen.php b/login/aquila-login-screen.php
index 2f70a4b..325222c 100644
--- a/login/aquila-login-screen.php
+++ b/login/aquila-login-screen.php
@@ -1,6 +1,6 @@
 <?php if (__FILE__ == $_SERVER['SCRIPT_FILENAME']) { exit; }
 
-if (!$aquilaLoginDisable) {
+if (empty($GLOBALS['aquilaLoginDisable']) || !$GLOBALS['aquilaLoginDisable']) {
 	add_filter('login_headerurl', 'aquila_admin_login_logo_url');
 	add_filter('login_headertext', 'aquila_admin_login_logo_title');
 	add_action('login_head', 'aquila_new_logo_login', 90); 
@@ -18,21 +18,24 @@ function aquila_admin_login_logo_title() {
 }
 
 function aquila_new_logo_login() {
-	echo "<style type='text/css'>
-		body.login #login:before {
-			display: none!important;
-		}
-		body.login #login h1 a {
-			display: block!important;
-		}
-		body.login #login h1 a {
-			background-image: url('" . $GLOBALS['aquilaNewLogo'] . "')!important;
-			background-size: contain;
-	    background-repeat: no-repeat;
-	    background-position: center center;
-	    width: auto;
-	    height: 80px;
-	    max-width: 350px;
-		}
-	</style>";
+	$options = get_option('aquilaLogoSettings');
+	if (!empty($options) && isset($GLOBALS['aquilaNewLogo'])) {
+		echo "<style type='text/css'>
+			body.login #login:before {
+				display: none!important;
+			}
+			body.login #login h1 a {
+				display: block!important;
+			}
+			body.login #login h1 a {
+				background-image: url('" . $GLOBALS['aquilaNewLogo'] . "')!important;
+				background-size: contain;
+				background-repeat: no-repeat;
+				background-position: center center;
+				width: auto;
+				height: 80px;
+				max-width: 350px;
+			}
+		</style>";
+	}
 }
diff --git a/readme.txt b/readme.txt
index 87a7a4d..b92b6c9 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_i
 Tags: admin theme, material design wordpress, material design admin theme, material design wordpress admin, material wordpress, admin, admin panel, admin theme style plugin, admin-theme, admin theme, aquila, backend theme, clean admin, color scheme, colour scheme, custom admin theme, flat admin theme, free admin theme, modern admin theme, new admin ui, plugin, simple admin theme, white label, white label admin, wordpress, WordPress admin, wordpress admin theme, wp-admin, wp admin page, wp admin theme
 Requires at least: 4.0
 Tested up to: 5.7
-Stable tag: 3.1
+Stable tag: 3.1.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -83,7 +83,7 @@ No. It only changes the admin area, the login page and the admin bar for logged-
 
 == Changelog ==
 
-= 3.1 - 31/05/2021 =
+= 3.1.1 - 31/05/2021 =
 * Code refactored.
 * Bug fixes.
 * New support links for adminbar.
@@ -225,7 +225,7 @@ No. It only changes the admin area, the login page and the admin bar for logged-
 
 == Upgrade Notice ==
 
-= 3.1 =
+= 3.1.1 =
 * Code refactored.
 * Bug fixes.
 * New support links for adminbar.
diff --git a/scripts.php b/scripts.php
index e13929e..3dd8855 100644
--- a/scripts.php
+++ b/scripts.php
@@ -16,7 +16,7 @@ function aquila_global_load_style() {
 }
 add_action('admin_enqueue_scripts', 'aquila_global_load_style');
 add_action('wp_head', 'aquila_global_load_style', 99);
-if (!$GLOBALS['aquilaLoginDisable']) {
+if (empty($GLOBALS['aquilaLoginDisable']) || !$GLOBALS['aquilaLoginDisable']) {
 	add_action('login_enqueue_scripts', 'aquila_global_load_style');
 }
 
@@ -45,7 +45,7 @@ function aquila_login_load_style() {
 	wp_enqueue_style('aquila-login-style');
 }
 
-if (!$GLOBALS['aquilaLoginDisable']) {
+if (empty($GLOBALS['aquilaLoginDisable']) || !$GLOBALS['aquilaLoginDisable']) {
 	add_action('login_enqueue_scripts', 'aquila_login_load_style');
 }