added keys and removed buttons