move some nav stuff around