Consolidate top nav markup