major changes,  from TableView to ListView + Custom Cells