Improved keyboard control
Fixed layout