UX Cleanup

https://www.pivotaltracker.com/story/show/80870558