Minor sample data update; Better setup view