Keyboard on new layout works

Dont worry, I will be doing major refactoring once I have full keyboard
functionality across all screens.