Added radiobuttons and comboboxes to the BDL frame
Resolving merge conflick code needs debugging