UX cleanup and fixes