Wrong path, too
Remove links from rows
Merge branch 'master' into gh-pages