Updated code

Reflect switch to catalog in 1.0.8.5=<.
Use classes for forms and queries
Use given product_id instead of earlier bad way
