More changes to listview etc