Make the template better