Changes to support full-screen edit