Updated pages to match new layout