Fixed bad nav structure