Added edit view
Merge conflict resolved