Added User default image and create new user icon on nav bar
resolved conflicts