Fixing data, removing graph, front-end touches, dynamic classes