Adding routes and cleaning up spec tests
Finish layout and routes