first pass at UI clean-up