MDL-45895 user: Re-organise orphans nodes on the preferences page