Use newly subdivided menu partials

This also puts proxies back into the mix.