More keyboard layout improvements