Finally have the links working accordingly