Markup fix; also a problem with deleting user-links.