Made navbar shorter
Fixed merge conflicts