diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index 118c3b01..a376058c 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -333,11 +333,13 @@ CHECKPOWER(){
 		
 			echo -e "${idsCL[White]}UPS Status               ${idsCL[Default]}: ${idsCL[LightCyan]}${UPS_STATUS}${idsCL[Default]}"
 			if [ ${REPORT} -eq 0 ]; then
+				AD1=$(IDS_NUMBER_FORMAT ${UPS_AMPSIN} 2 yes); c=0; spc1=''; spca=`expr ${wspc} - ${#AD1}`; until [ ${c} = ${spca} ]; do spc1="${spc1} "; ((c++)); done
+				AD2=$(IDS_NUMBER_FORMAT ${UPS_AMPSOUT} 2 yes); c=0; spc2=''; spca=`expr ${wspc} - ${#AD2}`; until [ ${c} = ${spca} ]; do spc2="${spc2} "; ((c++)); done
+				echo
+				echo -e "${idsCL[LightCyan]}                           Amps        Volts"
+				echo -e "${idsCL[White]}UPS Input                ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${UPS_AMPSIN}`'A${spc1}`IDS_NUMBER_FORMAT ${UPS_VOLTIN}`'V${idsCL[Default]}"
+				echo -e "${idsCL[White]}UPS Output               ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${UPS_AMPSOUT}`'A${spc1}`IDS_NUMBER_FORMAT ${UPS_VOLTOUT}`'V${idsCL[Default]}"
 				echo
-				echo -e "${idsCL[White]}UPS Voltage In           ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${UPS_VOLTIN}`'V${idsCL[Default]}"
-				echo -e "${idsCL[White]}UPS Amps In              ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${UPS_AMPSIN}`'A${idsCL[Default]}"
-				echo -e "${idsCL[White]}UPS Voltage Out          ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${UPS_VOLTOUT}`'V${idsCL[Default]}"
-				echo -e "${idsCL[White]}UPS Amps Out             ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${UPS_AMPSOUT}`'A${idsCL[Default]}"
 			fi
 			echo -e "${idsCL[White]}UPS Load Usage           ${idsCL[Default]}: ${idsCL[Green]}${UPS_LOAD}'%${idsCL[Default]}"
 			echo -e "${idsCL[White]}UPS Watts                ${idsCL[Default]}: ${idsCL[Green]}${UPS_WATTS}'W${idsCL[Default]}"