various ui changes
Merge branch 'master' of https://github.com/jmaxfield21/ScubaSteveMath