Added nameView and name and location data