UI cleanup, code cleanup