Fixed remote recharging
Minor UI fixes