Updated editing functionality and navigation control flow