revamped framework, modified settings, added CanvasJS charts