[Update] more improvements on keyboard