Improvements to Keyboard