Added smarter links; images