Changed the search on the bottle index page to include bottle types.  Added a bunch of css to accomodate the changes.