Add touch keyboard, fix two issues