Small visual fixes and change to sample data