Performance improvement fix, UI cleanup