[TASK] UI Cleanup