Fix Collection Null Pointer Exception
Refactor the ListFragment