Refactor active links