Different link formatting - is this better?