Rework linkage in navbar