fix new datastore structure in views
updates to mach the new settings structure and draft of integration test