Fixed a few bugs

Visual mostly, trying to add a listview instead