Tweaks to tasks-like menus/links
Merge branch 'refs/heads/master' into test