Pmitros/ux cleanup pass

Making a clean-up pass. Feel free to fold in at any point, but don't delete branch. I'll keep working here...