Updated RSpec
Finish layout and routes