Replaced listboxes with DataGridView
Added multi column displays and fixed tests