Integrate "add product" page and fix various issues