Changed the order of some of the lists