bugs fixes and added user id link