UX cleanup and fixes minor