refactor rspec
Finish layout and route