Some minor changes. Added an edit button