Fixed some stuff in nav