More reworking of linkage in navbar
Clean up code