ui clean-up