Added Text battery style, and tidied up a little bit of code in Circle Battery