Updated all of the lists part to the new style