Refractored ButtonKeys Keys to Key