updated navbar and models