Fix touch and clean up keylayout