Fixed and cleaned up the battery activity screen