Finished layout and routes
Added more tests & cleaned up rspec