navbar restructure