cleaned up code and changed listview theme