window nav changes
Merge
tweak auto-revert setting (meaningless)