Added user info to link page
Refactored