More charge page bugfixes