Updated pages to work with newe styling and html layout