UI spring cleaning