updated navbar, fixed guides.html merge bugs