Added cells to the list view, and did a bit of code cleanup.