Improved keyboard controls