continued template overhaul