Try to improve listview. Still a bit glitchy