Add a list view and fix some bug.