More UX update on controller