Refactor Row models and add Link