Added combo box and radio button functionality to all screens