Some work on KeyboardComponent