Added battery, improved GUI