fixed issues #597, #598

Modified view charge page