refactored toolbar code, added battery charging menu