ui cleanups