Misc. refactoring
Add some links on a user's response