This also brings some other changes: * Enables closing the window using Escape * Fixes a few criticals Closes #1258