fixing the layout and the rspec tests