Changed Wrapper Template Logic to not create un-wanted divs