Make the UI order make more sense (order by discovery, not randomly).