Updated for new keyboardNav option