Introduce better (?) keyboard handling