Adding battery and fixed GUI components