layout and all chart types now working on refactored data