Improve keyboard handling ++