moved navBar into layouts