Add Link fix
Merge branch 'dev' into Davidsfrontend