Refactored the ListFragments to be less brittle.