Template and asset fixes