Fixed all current errors
merge listView fix