Charge page bugfixes