Made navbar more generalized