Fixed edit mode UX