Made pages and sections more modular.