Design fixes for Add/Edit Product CPT (v2)

PR for #391 - now based