fixed old conflicts + small changes on listview