Restored Andy's navbar ordering