improve link organisation