fixed link issue
Merge branch 'dashboard' into front-end