move vkb layout changes to correct places