Added user profile links, minor refactoring

Soon doing a major refactoring