small improvement
Merge ui cleanups