Clean up rspec
Finish layout and routes