Added navbars / added Kevin's changes