Fix Battery bar 2dp and 3dp graphics glitch

and a bit codestlye

cheers

Change-Id: I7e01c351fdfc3e3f5adfaab9eba870a4b022cb47