Updated layout. Added correct creation of variatns