Use correct window title
Better escape key managment