BatteryArc: simplify + fix refreshing issues