added combox box instead of pop over