Move battery in status
Tweak comments