Bug fix
Editor bug fix
Merge branch 'feature/listwidget' into development