Added Ending Soon Logic to standard and redesign template