Fix a bunch of issues with the top nav