UI cleanup, misc work