added navbar, continued tests