separate link and screen
Merge branch 'khanhhd-user' into team1