Added loading modal, fixed keydown regression