Added list view and cleanup