add option menu for PO, and bug fix