Finish layout and routes
Layout and routes - improve rspec