links updated

using generated links....updated routing a bit