Refactoring style of chart pages - not yet complete