Improved the edit link functionality.
Merge branch 'develop'