Better keyboard (24/39)

Better keyboard