updated nav and sidebar