Made some changes to the order of items.