Gathered up the pages and fixed routing