Added more structure and 404 and basic page