added list view and general code changes