Modularized the ExpandingList a bit