Fixed up some nav stuff