Cup and new UI updates
Merge branch 'master' of https://github.com/jasonfleischer/KingsNThings into mvp-opt1