Placed task menu under title as it only pertains to main content, anyway.
Merge branch 'refs/heads/master' into test