Better URL go to logic, and new referal scafolding