Finish layout and routes
Modified RSpec tests to be more efficient