EST-229: Tidy up of refdata menus, and other small cosmetic stuff