Changed order of nav-bar