Rewrite menu generation

This no longer varies the html on X-Device

Change-Id: Ia8dae042f3765fc41b1c9c5144359a89906e15c2