[cleanup] UI Fixes