Update keyboard app
Merge pull request #1344 from teodosia/keyboard-improvement-v1train

Keyboard improvement v1-train