Added more intuitive links