Listbox fleshed out a bit, replaces a couple instances in project