enable/disable added, links improved