fixes when add new
add link
Merge branch 'develop'