Update

Cleaned up the listbox controls to prevent copy+pasting code