Fixed key layout to be more like old layout, fixed text input in UI