Fixed several bugs with nav