Few cleanups for UI widgets.