make links/labels correct