Make policies top-level
Correctly order nav items