Modified edit mode functionality
Modified edit mode functionality