cleaned up the data view a lot with ability to turn on and off