Keyboard bug fixed, UI Tweaks