Issue #29: Beautified the toggling between editing views