Move some of the navbar items around.

This makes slightly more sense.