small style corrections, and use a metro button instead of link
Merge branch 'master' into gh-pages