Restructured the site a little using partial pages and added a 404 with redirect