Refactor task links

Change-Id: If011be76bd3ff58e7f4451078516e55aafbeb19b