Template and style updates