More key binding tweaks