Ui cleanup more

Subtasks hide