Updated the print templates to support last changes