First Pass for new UI changes
Merge branch 'ui_effects'