updates for fixing flavor UI
Merge branch 'master' of https://github.com/StackMonkey/utter-va