diff --git a/scripts/battery.sh b/scripts/battery.sh
index 25dc32b..cb16297 100755
--- a/scripts/battery.sh
+++ b/scripts/battery.sh
@@ -83,7 +83,12 @@ main()
 {
 	bat_stat=$(battery_status)
 	bat_perc=$(battery_percent)
-	echo "♥ $bat_stat$bat_perc"
+
+	if [ -z "$bat_stat" ]; then # Test if status is empty or not
+		echo "♥ $bat_perc"
+	else
+		echo "♥ $bat_stat $bat_perc"
+	fi
 }
 
 #run main driver program
diff --git a/scripts/dracula.sh b/scripts/dracula.sh
index 275428f..5cd2155 100755
--- a/scripts/dracula.sh
+++ b/scripts/dracula.sh
@@ -123,7 +123,7 @@ main()
   
   # Non Powerline Configuration
   else
-    tmux set-option -g status-left "#[bg=${green},fg=${dark_gray}]#{?client_prefix,#[bg=${yellow}],} ${left_icon} "
+    tmux set-option -g status-left "#[bg=${green},fg=${dark_gray}]#{?client_prefix,#[bg=${yellow}],} ${left_icon}"
 
     tmux set-option -g  status-right ""
 
diff --git a/scripts/network.sh b/scripts/network.sh
index f95afda..145d142 100755
--- a/scripts/network.sh
+++ b/scripts/network.sh
@@ -16,8 +16,8 @@ get_ssid()
 		;;
 
 		Darwin)
-			if /System/Library/PrivateFrameworks/Apple80211.framework/Resources/airport -I | grep -E ' SSID' | cut -d ':' -f 2 &> /dev/null; then
-				echo "$(/System/Library/PrivateFrameworks/Apple80211.framework/Resources/airport -I | grep -E ' SSID' | cut -d ':' -f 2)"
+			if /System/Library/PrivateFrameworks/Apple80211.framework/Resources/airport -I | grep -E ' SSID' | cut -d ':' -f 2 | sed 's/ ^*//g' &> /dev/null; then
+				echo "$(/System/Library/PrivateFrameworks/Apple80211.framework/Resources/airport -I | grep -E ' SSID' | cut -d ':' -f 2)" | sed 's/ ^*//g'
 			else
 				echo 'Ethernet'
 			fi