Fix circle shape and url link text handling