More format changes
fix bug in visible_bottles
Basic top level navigation work: can get to Users and Bottles reasonable well.

Change all back buttons to :back