Cleaned out old list view logic, and simplified list view template