Minor admin view changes + fixed adding products
Merge
merge2