reformat template
take close tr tag out of conditional(!)