#326 Code changes for new desgin for the combo box