diff --git a/powerwall.sh b/powerwall.sh
index 5b4d0ec5..4e5e77d0 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -466,7 +466,10 @@ HOSTMGMT(){
 		else
 			ESXI_HOST=''
 		fi		
-		[ "${ESXI_HOST}" == "" ] && echo -e "Invalid host\n" && exit 1
+		if [ "${ESXI_HOST}" == "" ]; then
+			echo -e "Invalid host\n"
+			exit 1
+		fi
 		
 		if [ ${MN} -eq 1 ]; then
 			[ "${ESXI_HOST}" == "ALL" ] && hostname="All Host Servers" || hostname="All ${ESXI_HOST} Host Servers"
@@ -499,12 +502,12 @@ HOSTMGMT(){
 		esac
 		shift 1
 	done
-	c=0; spcA=''; spc1=`expr 31 - ${#hostname} - 1`; until [ ${c} = ${spc1} ]; do spcA="${spcA} "; c=`expr ${c} + 1`; done
+	c=0; spcA=''; spc1=`expr 21 - ${#hostname} - 1`; until [ ${c} = ${spc1} ]; do spcA="${spcA} "; c=`expr ${c} + 1`; done
 	echo -en "${idsCL[LightCyan]} Host: ${idsCL[Green]}${hostname}${spcA}"
 	if [ "${ESXI_HOST}" == "ALL" ] || [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "OFFSITE" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "SYS" ]; then
 		echo -e ""
 	else
-		c=0; spcB=''; spc1=`expr 28 - ${#ESXI_HOST} - 1`; until [ ${c} = ${spc1} ]; do spcB="${spcB} "; c=`expr ${c} + 1`; done
+		c=0; spcB=''; spc1=`expr 18 - ${#ESXI_HOST} - 1`; until [ ${c} = ${spc1} ]; do spcB="${spcB} "; c=`expr ${c} + 1`; done
 		echo -en "${idsCL[LightCyan]}Host IP: ${idsCL[Green]}${ESXI_HOST}${spcB}"
 		echo -e "${idsCL[LightCyan]}iDrac IP: ${idsCL[Green]}${idracip}${idsCL[Default]}"
 	fi