Updating data and demo UI to be nicer.