Fixed highlighting bug, listview selection bug