and add better links