Revert "Mode Edit design"

This reverts commit 2e51b41763e3d5f414ff6737d784ed6a8cc3cda9.