some changes to keyboard

Change-Id: Id96e969e04cc54b9731eb6f3c266b6a97a18ddee