Finish layout and routes
Clean up Rspec