small link/picture refactor