Refactored EditLink