Start reworking and fixing bugs in data visualization
Merge branch 'master' into feat/import-wizard