Nav

Style the nav and move some other stuff around