Finish layout add routes
Refactor Rspec tests and add missing links