Refactored escape handling, uncommented auto-focus. Bootstrap issue still exists. WIP on that.