Added listview and latest changes