Make the title links look better
Link titles only where appropriate
Merge branch 'develop'