More decal form tweaks