Finish layout and routes
Really finish the layout and routes without test failures this time