Make links more better