Fixed the Editing bugs