[cleanup] UI Fixes, minor