[TASK] UI Fixes and Improvements