Refactored bottles.new/.edit.  Made a few code changes and changed layout.  Intermediate commit to test on iPhone.