Added a combo box and Data Grid