Finish layout and routes
Fixed merge conflict in routes.rb