Tidied up some things, improved listview touch responsiveness