Filled in layout, upgrated rspec