navbar restructuring