diff --git a/powerwall.sh b/powerwall.sh
index 4ec289f3..8e7f3d62 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -20,8 +20,9 @@ CHECKTEMP(){
 	cw=25;
 	echo
 	[ "${1}" != "" ] && [ "${1}" != "noavg" ] && [[ "${1}" =~ ^[0-9]+$ ]] && avgdays=${1} || avgdays=3
+	[ ${avgdays} -lt 10 ] && avgdays_disp=" ${avgdays}" || avgdays_disp=${avgdays}
 	# echo -e "${idsCL[Yellow]}Sensor Temperature(s)                            ${idsCL[Green]}normal${idsCL[Default]} /${idsCL[Yellow]}warning${idsCL[Default]}/ ${idsCL[Red]}critical${idsCL[Default]}"
-	echo -e "${idsCL[Cyan]}Sensor Temperature(s)                 Current / ${avgdays}DayAVG   ${idsCL[Yellow]}warning${idsCL[Default]} / ${idsCL[Red]}critical${idsCL[Default]}"
+	echo -e "${idsCL[Cyan]}Sensor Temperature(s)                 Current / ${avgdays_disp}DayAVG   ${idsCL[Yellow]}warning${idsCL[Default]} / ${idsCL[Red]}critical${idsCL[Default]}"
 	DIVIDER . yellow 90
 		
 	for SENSOR in ${PW_SENSOR_ORD[@]}; do
@@ -161,7 +162,7 @@ CHECKTEMPSENSOR(){
 			echo -en "${idsCL[Green]}Normal   (${spct}${temp_f}'F /${spca}${averagedisp}${idsCL[Green]})${idsCL[Default]}"
 		fi
 		tmp="${spct}${temp_f}"
-		c=0; spc=''; spc1=`expr 8 - ${#tmp}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; c=`expr ${c} + 1`; done
+		c=0; spc=''; spc1=`expr 9 - ${#tmp}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; c=`expr ${c} + 1`; done
 		[ ${#temp_warn} == 2 ] && spcw='  ' || spcw=' '
 		[ ${#temp_crit} == 2 ] && spcc='  ' || spcc=' '
 		echo -e "${spc}[${spcw}${idsCL[Yellow]}${temp_warn}'F${idsCL[Default]} /${spcc}${idsCL[Red]}${temp_crit}'F=>${idsCL[Default]} ]"