Remove extra UserId field and update UI
Update project