Feature 28 edit view

for viewing and editing tasks- fixed merge issue