clean up admin_order buttons and combine form