MDL-40987, tidy up menuw and paging