Document creation buttons margin + code cleanup.
Enhance product set directive