Update F7 + fix for nav