Fixing a UI bug and updating the editor
Merge remote-tracking branch 'origin/master'