made the small changes after user testing
Merge branch 'master' of https://github.com/donna93n/orangejuice