REFACTOR/row-links