Improve keyboard sizing issues