diff --git a/app/Template/action/event.php b/app/Template/action/event.php
index 7f968a971..b4741a98c 100644
--- a/app/Template/action/event.php
+++ b/app/Template/action/event.php
@@ -11,7 +11,7 @@
     <?= $this->form->hidden('action_name', $values) ?>
 
     <?= $this->form->label(t('Event'), 'event_name') ?>
-    <?= $this->form->select('event_name', $events, $values) ?><br/>
+    <?= $this->form->select('event_name', $events, $values) ?>
 
     <div class="form-help">
         <?= t('When the selected event occurs execute the corresponding action.') ?>
diff --git a/app/Template/action/index.php b/app/Template/action/index.php
index 8275f0804..c28c7a4ba 100644
--- a/app/Template/action/index.php
+++ b/app/Template/action/index.php
@@ -67,9 +67,9 @@
     <?= $this->form->hidden('project_id', $values) ?>
 
     <?= $this->form->label(t('Action'), 'action_name') ?>
-    <?= $this->form->select('action_name', $available_actions, $values) ?><br/>
+    <?= $this->form->select('action_name', $available_actions, $values) ?>
 
     <div class="form-actions">
-        <input type="submit" value="<?= t('Next step') ?>" class="btn btn-blue"/>
+        <input type="submit" value="<?= t('Next step') ?>" class="btn btn-blue">
     </div>
 </form>
\ No newline at end of file
diff --git a/app/Template/board/tooltip_subtasks.php b/app/Template/board/tooltip_subtasks.php
index 5c273e080..5e48fcf41 100644
--- a/app/Template/board/tooltip_subtasks.php
+++ b/app/Template/board/tooltip_subtasks.php
@@ -2,6 +2,6 @@
 <?php foreach ($subtasks as $subtask): ?>
     <?= $this->subtask->toggleStatus($subtask, 'board', $task['project_id']) ?>
     <?= $this->e(empty($subtask['username']) ? '' : ' ['.$this->user->getFullname($subtask).']') ?>
-    <br/>
+    <br>
 <?php endforeach ?>
 </section>
diff --git a/app/Template/config/application.php b/app/Template/config/application.php
index ec7d84628..35d85dd8e 100644
--- a/app/Template/config/application.php
+++ b/app/Template/config/application.php
@@ -1,7 +1,6 @@
 <div class="page-header">
     <h2><?= t('Application settings') ?></h2>
 </div>
-<section>
 <form method="post" action="<?= $this->url->href('config', 'application') ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
@@ -23,10 +22,9 @@
     <?= $this->form->checkbox('password_reset', t('Enable "Forget Password"'), 1, $values['password_reset'] == 1) ?>
 
     <?= $this->form->label(t('Custom Stylesheet'), 'application_stylesheet') ?>
-    <?= $this->form->textarea('application_stylesheet', $values, $errors) ?><br/>
+    <?= $this->form->textarea('application_stylesheet', $values, $errors) ?>
 
     <div class="form-actions">
-        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue">
     </div>
 </form>
-</section>
\ No newline at end of file
diff --git a/app/Template/config/board.php b/app/Template/config/board.php
index 19a4bcd7e..f787a9312 100644
--- a/app/Template/config/board.php
+++ b/app/Template/config/board.php
@@ -1,25 +1,23 @@
 <div class="page-header">
     <h2><?= t('Board settings') ?></h2>
 </div>
-<section>
 <form method="post" action="<?= $this->url->href('config', 'board') ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
 
     <?= $this->form->label(t('Task highlight period'), 'board_highlight_period') ?>
-    <?= $this->form->number('board_highlight_period', $values, $errors) ?><br/>
+    <?= $this->form->number('board_highlight_period', $values, $errors) ?>
     <p class="form-help"><?= t('Period (in second) to consider a task was modified recently (0 to disable, 2 days by default)') ?></p>
 
     <?= $this->form->label(t('Refresh interval for public board'), 'board_public_refresh_interval') ?>
-    <?= $this->form->number('board_public_refresh_interval', $values, $errors) ?><br/>
+    <?= $this->form->number('board_public_refresh_interval', $values, $errors) ?>
     <p class="form-help"><?= t('Frequency in second (60 seconds by default)') ?></p>
 
     <?= $this->form->label(t('Refresh interval for private board'), 'board_private_refresh_interval') ?>
-    <?= $this->form->number('board_private_refresh_interval', $values, $errors) ?><br/>
+    <?= $this->form->number('board_private_refresh_interval', $values, $errors) ?>
     <p class="form-help"><?= t('Frequency in second (0 to disable this feature, 10 seconds by default)') ?></p>
 
     <div class="form-actions">
-        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue">
     </div>
 </form>
-</section>
\ No newline at end of file
diff --git a/app/Template/config/project.php b/app/Template/config/project.php
index c58a7bac6..a212f65f9 100644
--- a/app/Template/config/project.php
+++ b/app/Template/config/project.php
@@ -1,7 +1,6 @@
 <div class="page-header">
     <h2><?= t('Project settings') ?></h2>
 </div>
-<section>
 <form method="post" action="<?= $this->url->href('config', 'project') ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
@@ -10,11 +9,11 @@
     <?= $this->form->select('default_color', $colors, $values, $errors) ?>
 
     <?= $this->form->label(t('Default columns for new projects (Comma-separated)'), 'board_columns') ?>
-    <?= $this->form->text('board_columns', $values, $errors) ?><br/>
+    <?= $this->form->text('board_columns', $values, $errors) ?>
     <p class="form-help"><?= t('Default values are "%s"', $default_columns) ?></p>
 
     <?= $this->form->label(t('Default categories for new projects (Comma-separated)'), 'project_categories') ?>
-    <?= $this->form->text('project_categories', $values, $errors) ?><br/>
+    <?= $this->form->text('project_categories', $values, $errors) ?>
     <p class="form-help"><?= t('Example: "Bug, Feature Request, Improvement"') ?></p>
 
     <?= $this->form->checkbox('subtask_restriction', t('Allow only one subtask in progress at the same time for a user'), 1, $values['subtask_restriction'] == 1) ?>
@@ -22,7 +21,6 @@
     <?= $this->form->checkbox('cfd_include_closed_tasks', t('Include closed tasks in the cumulative flow diagram'), 1, $values['cfd_include_closed_tasks'] == 1) ?>
 
     <div class="form-actions">
-        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue">
     </div>
 </form>
-</section>
\ No newline at end of file
diff --git a/app/Template/currency/index.php b/app/Template/currency/index.php
index 1c78c47a0..07b58a8bf 100644
--- a/app/Template/currency/index.php
+++ b/app/Template/currency/index.php
@@ -29,10 +29,10 @@
     <?= $this->form->csrf() ?>
 
     <?= $this->form->label(t('Reference currency'), 'application_currency') ?>
-    <?= $this->form->select('application_currency', $currencies, $config_values, $errors) ?><br/>
+    <?= $this->form->select('application_currency', $currencies, $config_values, $errors) ?>
 
     <div class="form-actions">
-        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue">
     </div>
 </form>
 
@@ -43,12 +43,12 @@
     <?= $this->form->csrf() ?>
 
     <?= $this->form->label(t('Currency'), 'currency') ?>
-    <?= $this->form->select('currency', $currencies, $values, $errors) ?><br/>
+    <?= $this->form->select('currency', $currencies, $values, $errors) ?>
 
     <?= $this->form->label(t('Rate'), 'rate') ?>
-    <?= $this->form->text('rate', $values, $errors, array(), 'form-numeric') ?><br/>
+    <?= $this->form->text('rate', $values, $errors, array(), 'form-numeric') ?>
 
     <div class="form-actions">
-        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue">
     </div>
 </form>
diff --git a/app/Template/export/subtasks.php b/app/Template/export/subtasks.php
index 4aad2641e..f2a00f849 100644
--- a/app/Template/export/subtasks.php
+++ b/app/Template/export/subtasks.php
@@ -1,7 +1,5 @@
 <div class="page-header">
-    <h2>
-        <?= t('Subtasks exportation for "%s"', $project['name']) ?>
-    </h2>
+    <h2><?= t('Subtasks exportation for "%s"', $project['name']) ?></h2>
 </div>
 
 <p class="alert alert-info"><?= t('This report contains all subtasks information for the given date range.') ?></p>
@@ -13,7 +11,7 @@
     <?= $this->form->hidden('project_id', $values) ?>
 
     <?= $this->form->label(t('Start Date'), 'from') ?>
-    <?= $this->form->text('from', $values, $errors, array('required', 'placeholder="'.$this->text->in($date_format, $date_formats).'"'), 'form-date') ?><br/>
+    <?= $this->form->text('from', $values, $errors, array('required', 'placeholder="'.$this->text->in($date_format, $date_formats).'"'), 'form-date') ?>
 
     <?= $this->form->label(t('End Date'), 'to') ?>
     <?= $this->form->text('to', $values, $errors, array('required', 'placeholder="'.$this->text->in($date_format, $date_formats).'"'), 'form-date') ?>
@@ -21,6 +19,6 @@
     <div class="form-help"><?= t('Others formats accepted: %s and %s', date('Y-m-d'), date('Y_m_d')) ?></div>
 
     <div class="form-actions">
-        <input type="submit" value="<?= t('Execute') ?>" class="btn btn-blue"/>
+        <input type="submit" value="<?= t('Execute') ?>" class="btn btn-blue">
     </div>
 </form>
\ No newline at end of file
diff --git a/app/Template/export/summary.php b/app/Template/export/summary.php
index ffbd6ac20..0c2a96fb5 100644
--- a/app/Template/export/summary.php
+++ b/app/Template/export/summary.php
@@ -1,7 +1,5 @@
 <div class="page-header">
-    <h2>
-        <?= t('Daily project summary export for "%s"', $project['name']) ?>
-    </h2>
+    <h2><?= t('Daily project summary export for "%s"', $project['name']) ?></h2>
 </div>
 
 <p class="alert alert-info"><?= t('This export contains the number of tasks per column grouped per day.') ?></p>
@@ -13,7 +11,7 @@
     <?= $this->form->hidden('project_id', $values) ?>
 
     <?= $this->form->label(t('Start Date'), 'from') ?>
-    <?= $this->form->text('from', $values, $errors, array('required', 'placeholder="'.$this->text->in($date_format, $date_formats).'"'), 'form-date') ?><br/>
+    <?= $this->form->text('from', $values, $errors, array('required', 'placeholder="'.$this->text->in($date_format, $date_formats).'"'), 'form-date') ?>
 
     <?= $this->form->label(t('End Date'), 'to') ?>
     <?= $this->form->text('to', $values, $errors, array('required', 'placeholder="'.$this->text->in($date_format, $date_formats).'"'), 'form-date') ?>
@@ -21,6 +19,6 @@
     <div class="form-help"><?= t('Others formats accepted: %s and %s', date('Y-m-d'), date('Y_m_d')) ?></div>
 
     <div class="form-actions">
-        <input type="submit" value="<?= t('Execute') ?>" class="btn btn-blue"/>
+        <input type="submit" value="<?= t('Execute') ?>" class="btn btn-blue">
     </div>
 </form>
\ No newline at end of file
diff --git a/app/Template/export/tasks.php b/app/Template/export/tasks.php
index c74c8f982..c27149d26 100644
--- a/app/Template/export/tasks.php
+++ b/app/Template/export/tasks.php
@@ -1,7 +1,5 @@
 <div class="page-header">
-    <h2>
-        <?= t('Tasks exportation for "%s"', $project['name']) ?>
-    </h2>
+    <h2><?= t('Tasks exportation for "%s"', $project['name']) ?></h2>
 </div>
 
 <p class="alert alert-info"><?= t('This report contains all tasks information for the given date range.') ?></p>
@@ -13,7 +11,7 @@
     <?= $this->form->hidden('project_id', $values) ?>
 
     <?= $this->form->label(t('Start Date'), 'from') ?>
-    <?= $this->form->text('from', $values, $errors, array('required', 'placeholder="'.$this->text->in($date_format, $date_formats).'"'), 'form-date') ?><br/>
+    <?= $this->form->text('from', $values, $errors, array('required', 'placeholder="'.$this->text->in($date_format, $date_formats).'"'), 'form-date') ?>
 
     <?= $this->form->label(t('End Date'), 'to') ?>
     <?= $this->form->text('to', $values, $errors, array('required', 'placeholder="'.$this->text->in($date_format, $date_formats).'"'), 'form-date') ?>
@@ -21,6 +19,6 @@
     <div class="form-help"><?= t('Others formats accepted: %s and %s', date('Y-m-d'), date('Y_m_d')) ?></div>
 
     <div class="form-actions">
-        <input type="submit" value="<?= t('Execute') ?>" class="btn btn-blue"/>
+        <input type="submit" value="<?= t('Execute') ?>" class="btn btn-blue">
     </div>
 </form>
\ No newline at end of file
diff --git a/app/Template/export/transitions.php b/app/Template/export/transitions.php
index bf6ef2491..d935bde17 100644
--- a/app/Template/export/transitions.php
+++ b/app/Template/export/transitions.php
@@ -1,7 +1,5 @@
 <div class="page-header">
-    <h2>
-        <?= t('Task transitions export') ?>
-    </h2>
+    <h2><?= t('Task transitions export') ?></h2>
 </div>
 
 <p class="alert alert-info"><?= t('This report contains all column moves for each task with the date, the user and the time spent for each transition.') ?></p>
@@ -13,7 +11,7 @@
     <?= $this->form->hidden('project_id', $values) ?>
 
     <?= $this->form->label(t('Start Date'), 'from') ?>
-    <?= $this->form->text('from', $values, $errors, array('required', 'placeholder="'.$this->text->in($date_format, $date_formats).'"'), 'form-date') ?><br/>
+    <?= $this->form->text('from', $values, $errors, array('required', 'placeholder="'.$this->text->in($date_format, $date_formats).'"'), 'form-date') ?>
 
     <?= $this->form->label(t('End Date'), 'to') ?>
     <?= $this->form->text('to', $values, $errors, array('required', 'placeholder="'.$this->text->in($date_format, $date_formats).'"'), 'form-date') ?>
@@ -21,6 +19,6 @@
     <div class="form-help"><?= t('Others formats accepted: %s and %s', date('Y-m-d'), date('Y_m_d')) ?></div>
 
     <div class="form-actions">
-        <input type="submit" value="<?= t('Execute') ?>" class="btn btn-blue"/>
+        <input type="submit" value="<?= t('Execute') ?>" class="btn btn-blue">
     </div>
 </form>
\ No newline at end of file
diff --git a/app/Template/group/associate.php b/app/Template/group/associate.php
index dc665bb36..468281e20 100644
--- a/app/Template/group/associate.php
+++ b/app/Template/group/associate.php
@@ -13,10 +13,10 @@
             <?= $this->form->hidden('group_id', $values) ?>
 
             <?= $this->form->label(t('User'), 'user_id') ?>
-            <?= $this->form->select('user_id', $users, $values, $errors, array('required'), 'chosen-select') ?><br/>
+            <?= $this->form->select('user_id', $users, $values, $errors, array('required'), 'chosen-select') ?>
 
             <div class="form-actions">
-                <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+                <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue">
                 <?= t('or') ?>
                 <?= $this->url->link(t('cancel'), 'group', 'index') ?>
             </div>
diff --git a/app/Template/group/create.php b/app/Template/group/create.php
index 696e50132..4a935c08a 100644
--- a/app/Template/group/create.php
+++ b/app/Template/group/create.php
@@ -8,10 +8,10 @@
         <?= $this->form->csrf() ?>
 
         <?= $this->form->label(t('Name'), 'name') ?>
-        <?= $this->form->text('name', $values, $errors, array('autofocus', 'required', 'maxlength="100"')) ?><br/>
+        <?= $this->form->text('name', $values, $errors, array('autofocus', 'required', 'maxlength="100"')) ?>
 
         <div class="form-actions">
-            <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+            <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue">
             <?= t('or') ?>
             <?= $this->url->link(t('cancel'), 'group', 'index') ?>
         </div>
diff --git a/app/Template/group/edit.php b/app/Template/group/edit.php
index 4d7e5e81e..d9646ee84 100644
--- a/app/Template/group/edit.php
+++ b/app/Template/group/edit.php
@@ -11,10 +11,10 @@
         <?= $this->form->hidden('external_id', $values) ?>
 
         <?= $this->form->label(t('Name'), 'name') ?>
-        <?= $this->form->text('name', $values, $errors, array('autofocus', 'required', 'maxlength="100"')) ?><br/>
+        <?= $this->form->text('name', $values, $errors, array('autofocus', 'required', 'maxlength="100"')) ?>
 
         <div class="form-actions">
-            <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+            <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue">
             <?= t('or') ?>
             <?= $this->url->link(t('cancel'), 'group', 'index') ?>
         </div>
diff --git a/app/Template/password_reset/change.php b/app/Template/password_reset/change.php
index 310f0f977..6d06f442c 100644
--- a/app/Template/password_reset/change.php
+++ b/app/Template/password_reset/change.php
@@ -4,13 +4,13 @@
         <?= $this->form->csrf() ?>
 
         <?= $this->form->label(t('New password'), 'password') ?>
-        <?= $this->form->password('password', $values, $errors) ?><br/>
+        <?= $this->form->password('password', $values, $errors) ?>
 
         <?= $this->form->label(t('Confirmation'), 'confirmation') ?>
         <?= $this->form->password('confirmation', $values, $errors) ?>
 
         <div class="form-actions">
-            <input type="submit" value="<?= t('Change Password') ?>" class="btn btn-blue"/>
+            <input type="submit" value="<?= t('Change Password') ?>" class="btn btn-blue">
         </div>
     </form>
 </div>
\ No newline at end of file
diff --git a/app/Template/project_user/sidebar.php b/app/Template/project_user/sidebar.php
index 27f1094c1..ff113ebb5 100644
--- a/app/Template/project_user/sidebar.php
+++ b/app/Template/project_user/sidebar.php
@@ -10,7 +10,7 @@
             'chosen-select select-auto-redirect'
         ) ?>
 
-    <br/><br/>
+    <br><br>
     <ul>
         <li <?= $this->app->checkMenuSelection('projectuser', 'managers') ?>>
             <?= $this->url->link(t('Project managers'), 'projectuser', 'managers', $filter) ?>
diff --git a/app/Template/swimlane/index.php b/app/Template/swimlane/index.php
index 9502cffd2..65751606e 100644
--- a/app/Template/swimlane/index.php
+++ b/app/Template/swimlane/index.php
@@ -7,7 +7,7 @@
     <?= $this->form->hidden('id', $default_swimlane) ?>
 
     <?= $this->form->label(t('Rename'), 'default_swimlane') ?>
-    <?= $this->form->text('default_swimlane', $default_swimlane, array(), array('required', 'maxlength="50"')) ?><br/>
+    <?= $this->form->text('default_swimlane', $default_swimlane, array(), array('required', 'maxlength="50"')) ?>
 
     <?php if (! empty($active_swimlanes) || $default_swimlane['show_default_swimlane'] == 0): ?>
         <?= $this->form->checkbox('show_default_swimlane', t('Show default swimlane'), 1, $default_swimlane['show_default_swimlane'] == 1) ?>
diff --git a/app/Template/tasklink/show.php b/app/Template/tasklink/show.php
index 11b12b73e..fd8b37a64 100644
--- a/app/Template/tasklink/show.php
+++ b/app/Template/tasklink/show.php
@@ -45,7 +45,7 @@
                     ) ?>
                 <?php endif ?>
 
-                <br/>
+                <br>
 
                 <?php if (! empty($link['task_time_spent'])): ?>
                     <strong><?= $this->e($link['task_time_spent']).'h' ?></strong> <?= t('spent') ?>
diff --git a/app/Template/twofactor/show.php b/app/Template/twofactor/show.php
index dd72965a5..d6d8f4051 100644
--- a/app/Template/twofactor/show.php
+++ b/app/Template/twofactor/show.php
@@ -9,7 +9,7 @@
     <?php endif ?>
 
     <?php if (! empty($qrcode_url)): ?>
-        <p><br/><img src="<?= $qrcode_url ?>"/><br/><br/></p>
+        <p><br><img src="<?= $qrcode_url ?>"/><br><br></p>
     <?php endif ?>
 
     <?php if (! empty($key_url)): ?>
@@ -26,6 +26,6 @@
     <?= $this->form->text('code', array(), array(), array('placeholder="123456"', 'autofocus'), 'form-numeric') ?>
 
     <div class="form-actions">
-        <input type="submit" value="<?= t('Check my code') ?>" class="btn btn-blue"/>
+        <input type="submit" value="<?= t('Check my code') ?>" class="btn btn-blue">
     </div>
 </form>
\ No newline at end of file
diff --git a/app/Template/user/password.php b/app/Template/user/password.php
index 3ef28d337..a24a4ee4a 100644
--- a/app/Template/user/password.php
+++ b/app/Template/user/password.php
@@ -9,17 +9,17 @@
 
     <div class="alert alert-error">
         <?= $this->form->label(t('Current password for the user "%s"', $this->user->getFullname()), 'current_password') ?>
-        <?= $this->form->password('current_password', $values, $errors) ?><br/>
+        <?= $this->form->password('current_password', $values, $errors) ?>
     </div>
 
     <?= $this->form->label(t('New password for the user "%s"', $this->user->getFullname($user)), 'password') ?>
-    <?= $this->form->password('password', $values, $errors) ?><br/>
+    <?= $this->form->password('password', $values, $errors) ?>
 
     <?= $this->form->label(t('Confirmation'), 'confirmation') ?>
-    <?= $this->form->password('confirmation', $values, $errors) ?><br/>
+    <?= $this->form->password('confirmation', $values, $errors) ?>
 
     <div class="form-actions">
-        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue">
         <?= t('or') ?>
         <?= $this->url->link(t('cancel'), 'user', 'show', array('user_id' => $user['id'])) ?>
     </div>