Fix keys and add keys for navigator.