Add ESC and ENTER keys support
Modal adjustement