Adding better nav manu, reset of headers of subpunchlines