Task list functionality moved into adapter
Moved functionality from exp List into adapter
Merge fix