Fix main nav issues