Added ESC/cancel function (keyboard only) and fixed order store