Finished the layout and routes, updated the rspec tests