button updates
Merge branch 'dev' of github.com:owlbytes/HootsApp into chore/alex_bug_fix