fdo#84550 Reflect new field order also in Menu

And remove page number fields from HTML documents - there are no pages in HTML.

Change-Id: I48a157ba6cb283185d0b58e2fa48227d154def98