fix company address
fix
APO. New/edit pages with right fields