cleaned up data table views
merged and fixed table views