Add, edit, delete links
Merge remote-tracking branch 'origin/master'