Can ESC exit from a few more screens. Fixed main screen existing twice bug