more ui cleanups