A few more changes for "pretty" links