Clean up / Still not fixed Battery % toggle...grrr