Cleaned up list view a bit