Cleaned up views and forms
Tryin to keep track, really.
Merge branch 'master' of github.com:gnfisher/menu_shopper