Switch to 2-level grouping + add navigation for intro text