Finished refactoring of rspec
Finish layout and routes