Fix bugs for charger

Fix bugs for charger. Simplying UI