Added basic edit mode