Amend the keyboard and button references

Amend the keyboard and button references.