Finish layout, edit RSpec