Improved keyboard editing