Latest UX fixes

Not finalized