styled the show page
resolved git conflict
cleared rspec errors