Fixed listView bug and overall clean up