Style rework for tag template