refactoring, add contextual links