cleaning up master view, moving data loading into this view