Fix bugs in listView