More UI cleanups