some more UI cleanup, etc