attempting to fix some UX issues
Merge branch 'master' of github.com:echowaves/Echowaves.ios