Finish layout and accompanying RSpec tests