Changed format to listbox. Adding new controls.