diff --git a/themes/finc/templates/RecordDriver/DefaultRecord/cover.phtml b/themes/finc/templates/RecordDriver/DefaultRecord/cover.phtml
index 21d893f58b01b0894a6b6c40436df7527ba9722e..f7714d5a5d7762e5773da2e5bd051a18d3fcb1e3 100644
--- a/themes/finc/templates/RecordDriver/DefaultRecord/cover.phtml
+++ b/themes/finc/templates/RecordDriver/DefaultRecord/cover.phtml
@@ -23,7 +23,7 @@
       aria-label="<?=$this->transEscAttr('Link-to')?> <?=$this->transEscAttr('Cover Image')?> <?=$this->transEscAttr('of')?> <?=$title?>"
     >
   <?php endif; ?>
-  <img alt="<?=$alt?>" <?php if ($linkPreview): ?>data-linkpreview="true" <?php endif; ?>class="recordcover" src="<?=$this->escapeHtmlAttr(($cover)); ?>" />
+  <img alt="<?=$alt?>" <?php if ($linkPreview): ?>data-linkpreview="true" <?php endif; ?>class="recordcover" src="<?=$this->escapeHtmlAttr(($cover)); ?>">
   <?php if ($this->link): ?>
     </a>
     <?php
@@ -34,7 +34,7 @@ JS;
   <?=$this->inlineScript(\Laminas\View\Helper\HeadScript::SCRIPT, $coverDetailScript, 'SET'); ?>
   <?php endif; ?>
 <?php elseif ($cover === false): ?>
-  <img src="<?=$this->url('cover-unavailable')?>" <?php if ($linkPreview): ?>data-linkpreview="true" <?php endif; ?>class="nocover" alt="<?=$this->transEscAttr('No Cover Image')?>" aria-hidden="true" tabindex="-1" />
+  <img src="<?=$this->url('cover-unavailable')?>" <?php if ($linkPreview): ?>data-linkpreview="true" <?php endif; ?>class="nocover" alt="<?=$this->transEscAttr('No Cover Image')?>" aria-hidden="true" tabindex="-1">
 <?php else: ?>
   <?php /* load cover by ajax */ ?>
   <div id="<?=$coverId?>" class="ajaxcover">
@@ -42,7 +42,7 @@ JS;
      <div class="cover-container">
         <?=$this->setIconText = false;?>
         <a class="coverlink hidden" href="javascript:" aria-hidden="true" tabindex="-1">
-          <img <?php if ($linkPreview): ?>data-linkpreview="true" <?php endif; ?> class="recordcover ajax" src="<?=$this->url('cover-unavailable')?>" alt="<?=$this->escapeHtmlAttr($alt); ?>" />
+          <img <?php if ($linkPreview): ?>data-linkpreview="true" <?php endif; ?> class="recordcover ajax" src="<?=$this->url('cover-unavailable')?>" alt="<?=$this->escapeHtmlAttr($alt); ?>">
           <?php
               $coverScript = <<<JS
               loadCoverByElement(
diff --git a/themes/finc/templates/cart/contents.phtml b/themes/finc/templates/cart/contents.phtml
index 7eb666ee295792e8e8b5fa4dcac5a8036aa8f44a..9c08eb074bb04d1006c0d14d99989c1d93fcb530 100644
--- a/themes/finc/templates/cart/contents.phtml
+++ b/themes/finc/templates/cart/contents.phtml
@@ -1,7 +1,7 @@
 <!-- finc: cart - contents -->
 <?php $records = $this->cart()->getRecordDetails();
 if (!empty($records)): ?>
-  <hr/>
+  <hr>
   <ul class="list-unstyled">
   <?php foreach ($records as $i => $record): ?>
     <li>
diff --git a/themes/finc/templates/myresearch/edit.phtml b/themes/finc/templates/myresearch/edit.phtml
index 4ad763f6e5fed000d2857d04ed400cc49c3219d2..01023cf62d8d1b583d6567a6e79fc4d03dbd28ba 100644
--- a/themes/finc/templates/myresearch/edit.phtml
+++ b/themes/finc/templates/myresearch/edit.phtml
@@ -49,7 +49,7 @@
     </div>
   <?php endif; ?>
   <?php if (count($this->lists) > 0): ?>
-    <hr/>
+    <hr>
     <div class="form-group">
       <select name="addToList" class="form-control">
         <option value="-1">- <?=$this->transEsc('Add to another list')?> -</option>
diff --git a/themes/finc/templates/myresearch/newpassword.phtml b/themes/finc/templates/myresearch/newpassword.phtml
index 334b80035ff83589128916e4a8229599a4ec12ec..f383da468b0e08987583a31affd209df50dda8a7 100644
--- a/themes/finc/templates/myresearch/newpassword.phtml
+++ b/themes/finc/templates/myresearch/newpassword.phtml
@@ -23,7 +23,7 @@
 <?php elseif (!isset($this->hash)): ?>
   <div class="error"><?=$this->transEsc('recovery_user_not_found') ?></div>
 <?php else: ?>
-  <form id="newpassword" class="form-new-password" action="<?=$this->url('myresearch-newpassword') ?>" method="post" data-toggle="validator" role="form">
+  <form id="newpassword" class="form-new-password" action="<?=$this->url('myresearch-newpassword') ?>" method="post" data-toggle="validator">
     <input type="hidden" value="<?=$this->escapeHtmlAttr($this->auth()->getManager()->getCsrfHash())?>" name="csrf"/>
     <input type="hidden" value="<?=$this->escapeHtmlAttr($this->hash) ?>" name="hash"/>
     <input type="hidden" value="<?=$this->escapeHtmlAttr($this->username) ?>" name="username"/>
diff --git a/themes/finc/templates/myresearch/setpin.phtml b/themes/finc/templates/myresearch/setpin.phtml
index d3ec8d6401c54e2f5213ec0153490ac9bbd31b1d..e280dc9d634c5c7c8d6bfdbcd32c5fae98ed6058 100644
--- a/themes/finc/templates/myresearch/setpin.phtml
+++ b/themes/finc/templates/myresearch/setpin.phtml
@@ -23,7 +23,7 @@ $this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') .
     <?php elseif (!isset($this->hash)): ?>
       <div class="error"><?=$this->transEsc('recovery_user_not_found')?></div>
     <?php else: ?>
-      <form id="setpin" class="form-set-pin" action="<?=$this->url('myresearch-setpin')?>" method="post" data-toggle="validator" role="form">
+      <form id="setpin" class="form-set-pin" action="<?=$this->url('myresearch-setpin')?>" method="post" data-toggle="validator">
         <input type="hidden" value="<?=$this->escapeHtmlAttr($this->auth()->getManager()->getCsrfHash(true))?>" name="csrf"/>
         <input type="hidden" value="<?=$this->escapeHtmlAttr($this->hash)?>" name="hash"/>
         <input type="hidden" value="<?=$this->escapeHtmlAttr($this->username)?>" name="username"/>
diff --git a/themes/finc/templates/record/save.phtml b/themes/finc/templates/record/save.phtml
index a74f3371334ba1aec7e93b4b0718af3e6c34d6aa..f75be9a59327a88ead51fe64d13aef7ff0b443ba 100644
--- a/themes/finc/templates/record/save.phtml
+++ b/themes/finc/templates/record/save.phtml
@@ -19,7 +19,7 @@
     <?php foreach ($this->containingLists as $i => $list): ?>
       <a href="<?=$this->url('userList', ['id' => $list['id']]) ?>" data-lightbox-ignore><?=$this->escapeHtml($list['title'])?></a><?php if($i < count($this->containingLists) - 1): ?>, <?php endif; ?>
     <?php endforeach; ?>
-    </p><hr/>
+    </p><hr>
   <?php endif; ?>
 
   <?php /* Only display the list drop-down if the user has lists that do not contain