UI fixes, Keyboard fixes