Simplified data format
Separated Graph and Table. Improved UI.