UI cleanup step 1