Added content to task page
Merged conflicts