UX fixes to meet expectations.