add battery tab and clean up