Fixed bug caused by renaming of DOM element
For #master
Fixed bug
For #26-data-model-visualization
Merge branch 'master' into 26-data-model-visualization
Needed to fix a previous bug
For #26-data-model-visualization