some UI clean-up