gui with ESC and some other minor changes