Updated reusable pages for new navigation