diff --git a/app/module/core/presenter/templates/components/form.latte b/app/module/core/presenter/templates/components/form.latte
index d1f35c33..773c3fd6 100644
--- a/app/module/core/presenter/templates/components/form.latte
+++ b/app/module/core/presenter/templates/components/form.latte
@@ -9,7 +9,7 @@
 		n:if="!$input->getOption(rendered) && $input->getOption(type) !== hidden"
 		n:class="$input->required ? required">
 
-		<th>{label $input}</th>
+		<th>{label $input /}</th>
 		<td>{input $input} <span class=error n:ifcontent>{$input->error}</span></td>
 	</tr>
 	</table>
diff --git a/app/module/core/presenter/templates/components/notes.latte b/app/module/core/presenter/templates/components/notes.latte
deleted file mode 100644
index a81fc025..00000000
--- a/app/module/core/presenter/templates/components/notes.latte
+++ /dev/null
@@ -1,34 +0,0 @@
-{ifset $noteList}
-    {foreach $noteList as $noteBlock}
-
-
-        <!-- Modal dialog for note {$noteBlock->specialPage} -->
-
-        <div n:if="!empty($noteBlock->specialPage)" class="modal fade bd-example-modal-lg" tabindex="-1" id="note_modal_{str_replace(':', '_', $noteBlock->specialPage)}" role="dialog" aria-labelledby="note_{$noteBlock->getId()}_{$noteBlock->specialPage}_modal_label" aria-hidden="true">
-            <div class="modal-dialog modal-lg">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title" id="note_{$noteBlock->getId()}_{$noteBlock->specialPage}_modal_label">{$noteBlock->getCaption()}</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                            <span aria-hidden="true">&times;</span>
-                        </button>
-                    </div>
-                    <div class="modal-body">
-                        {$noteBlock->source|noescape}
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-primary" data-dismiss="modal">{_common.ok}</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-    {/foreach}
-    
-    <script n:if="count($notesToShow)">
-        $(document).ready(function () {
-        {foreach $notesToShow as $showNoteItem}
-                    $('#note_modal_{$showNoteItem|noescape}').modal('show');
-        {/foreach}
-        });
-    </script>
-{/ifset}
diff --git a/app/module/setting/presenter/templates/Event/default.latte b/app/module/setting/presenter/templates/Event/default.latte
index af6dec45..f89fc0e4 100644
--- a/app/module/setting/presenter/templates/Event/default.latte
+++ b/app/module/setting/presenter/templates/Event/default.latte
@@ -92,7 +92,7 @@
                     </table>
                 </div>
                 <div class="card-footer text-right">
-                    <a n:if="$user->isAllowed($user->getId(), 'SYS:EVE_CREATE')" class="btn btn-lg btn-success" href="{plink :Setting:Event:New}" onclick="btnRotate:$(this), true"" title="{_common.save}" style="margin-right: 10px">
+                    <a n:if="$user->isAllowed($user->getId(), 'SYS:EVE_CREATE')" class="btn btn-lg btn-success" href="{plink :Setting:Event:New}" onclick="btnRotate($(this), true)" title="{_common.save}" style="margin-right: 10px">
                         <i class="fa fa-plus" aria-hidden="true"></i>
                     </a>
                 </div>