Pushing some small changes in the mustache templates