Finish layout and routes
One more commit