Added charging, improved initial ProgressCircle display
Normalized curly braces on previous line
More formatting tweaks (hopefully last batch)
Tweaked ProgressCircle display