UX cleanup