Organized new nav a bit more

Also used the nav-header class instead of disabling links