UI cleanup
Merge branch 'master' of https://github.com/ml27299/Rinse_App