Added combo box and reorganized UI