Added add/remove buttons, urn headers