[TASK] UI Improvements