Styling, small refactor of link row into partial
Fixed merge conflict