Added update-span-width mixin
Simplified mixing names