Changed Navigation

Mixed things up a little