simplified navbar, better flow