navbar, fixed bugs