Simplify nav a bit