Minor changes to DataService and css