Remove Escape, need to rework on escape key