Restructured layout of all pages

Also fixed a title bar issue on one page