Updated nav to be ordered more logically