Fix keylayout
more cleanup