Improve link output logic & display