Updated with working battery level indication