Some updates to the listview and the showing/hiding parts of the form
committing because of conflicts