Add full battery state handling, add bounds for battery images indices