Added extra tasks
Looking for correct ListView display
Merge Conflict fixed