Bug 868819: modify auto-correct UX and visuals