Fix row/column swap and broken links