Added correct link and first and last name functionalityy