better template markup