Updated battery layout