Made home and mail links better
Merge branch 'master' into gh-pages