Consolidated indexes
Removed unused data/properties
UI improvements