Adam Nadel's changes and second nav