Greatly improved key layout switching.