Add menu headers, make esc key behave closer to original