Refactoring rating by bottle. Changed layout to combint 2 rows into a single column.  Intermediate commit for iPhone testing.