Changed navbar button to link
Fixed merge conflicts with header