diff --git a/remoteappmanager/templates/admin/accounting.html b/remoteappmanager/templates/admin/accounting.html
index 4aa6a4b40..e67a4b20f 100644
--- a/remoteappmanager/templates/admin/accounting.html
+++ b/remoteappmanager/templates/admin/accounting.html
@@ -47,9 +47,9 @@ <h3>User applications - {{ user.name }}</h3>
 {% endblock %}
 
 {% block dialogs %}
-    {% call modal('Action', btn_label='OK') %}
+    {% call macros.modal_dlg('Action', btn_label='OK') %}
     {% endcall %}
-    {% call modal('Create New Policy', btn_label='OK', btn_class="btn-primary", buttons_dismiss=false) %}
+    {% call macros.modal_dlg('Create New Policy', btn_label='OK', btn_class="btn-primary", buttons_dismiss=false) %}
         <form>
           <input type="hidden" id="user_name" value="{{ user.name }}">
           <div class="form-group">
diff --git a/remoteappmanager/templates/admin/applications.html b/remoteappmanager/templates/admin/applications.html
index 756e6d154..8e264af48 100644
--- a/remoteappmanager/templates/admin/applications.html
+++ b/remoteappmanager/templates/admin/applications.html
@@ -40,9 +40,9 @@ <h3>Applications</h3>
 {% endblock %}
 
 {% block dialogs %}
-    {% call modal('Action', btn_label='OK') %}
+    {% call macros.modal_dlg('Action', btn_label='OK') %}
     {% endcall %}
-    {% call modal('Create New', btn_label='OK', btn_class="btn-primary", buttons_dismiss=false) %}
+    {% call macros.modal_dlg('Create New', btn_label='OK', btn_class="btn-primary", buttons_dismiss=false) %}
         <form>
             <label for="image-name">Image name</label>
             <input type="text" class="form-control" id="image-name">
diff --git a/remoteappmanager/templates/admin/containers.html b/remoteappmanager/templates/admin/containers.html
index caee4da13..dd8c025da 100644
--- a/remoteappmanager/templates/admin/containers.html
+++ b/remoteappmanager/templates/admin/containers.html
@@ -36,7 +36,7 @@ <h3>Currently Running Containers</h3>
 {% endblock %}
 
 {% block dialogs %}
-    {% call modal('Action', btn_label='OK') %}
+    {% call macros.modal_dlg('Action', btn_label='OK') %}
     {% endcall %}
 {% endblock %}
 
diff --git a/remoteappmanager/templates/admin/users.html b/remoteappmanager/templates/admin/users.html
index 2961e8559..ba5d476f3 100644
--- a/remoteappmanager/templates/admin/users.html
+++ b/remoteappmanager/templates/admin/users.html
@@ -42,9 +42,9 @@ <h3>Users</h3>
 {% endblock %}
 
 {% block dialogs %}
-    {% call modal('Action', btn_label='OK') %}
+    {% call macros.modal_dlg('Action', btn_label='OK') %}
     {% endcall %}
-    {% call modal('Create New', btn_label='OK', btn_class="btn-primary", buttons_dismiss=false) %}
+    {% call macros.modal_dlg('Create New', btn_label='OK', btn_class="btn-primary", buttons_dismiss=false) %}
         <form>
             <label for="user-name">User name</label>
             <input type="text" class="form-control" id="user-name">
diff --git a/remoteappmanager/templates/macros.html b/remoteappmanager/templates/macros.html
new file mode 100644
index 000000000..c16859d54
--- /dev/null
+++ b/remoteappmanager/templates/macros.html
@@ -0,0 +1,22 @@
+{% macro modal_dlg(title, btn_label=None, btn_class="btn-primary", modal_class="", buttons_dismiss=true) %}
+  {% set key = title.replace(' ', '-').lower() %}
+  {% set btn_label = btn_label or title %}
+  <div class="modal fade {{ modal_class }}" id="{{key}}-dialog" tabindex="-1" role="dialog" aria-labelledby="{{key}}-label" aria-hidden="true">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button" class="close modal-close" {% if buttons_dismiss %}data-dismiss="modal"{% endif %}><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+          <h4 class="modal-title" id="{{key}}-label">{{title}}</h4>
+        </div>
+        <div class="modal-body">
+          {{ caller() }}
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-default modal-close" {% if buttons_dismiss %}data-dismiss="modal"{% endif %}>Cancel</button>
+          <button type="button" class="btn {{btn_class}} primary" {% if buttons_dismiss %}data-dismiss="modal"{% endif %}>{{btn_label}}</button>
+        </div>
+      </div>
+    </div>
+  </div>
+{% endmacro %}
+
diff --git a/remoteappmanager/templates/page.html b/remoteappmanager/templates/page.html
index 1c87dae74..bd6bce903 100644
--- a/remoteappmanager/templates/page.html
+++ b/remoteappmanager/templates/page.html
@@ -1,24 +1,4 @@
-{% macro modal(title, btn_label=None, btn_class="btn-primary", modal_class="", buttons_dismiss=true) %}
-{% set key = title.replace(' ', '-').lower() %}
-{% set btn_label = btn_label or title %}
-<div class="modal fade {{ modal_class }}" id="{{key}}-dialog" tabindex="-1" role="dialog" aria-labelledby="{{key}}-label" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close modal-close" {% if buttons_dismiss %}data-dismiss="modal"{% endif %}><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-        <h4 class="modal-title" id="{{key}}-label">{{title}}</h4>
-      </div>
-      <div class="modal-body">
-        {{ caller() }}
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default modal-close" {% if buttons_dismiss %}data-dismiss="modal"{% endif %}>Cancel</button>
-        <button type="button" class="btn {{btn_class}} primary" {% if buttons_dismiss %}data-dismiss="modal"{% endif %}>{{btn_label}}</button>
-      </div>
-    </div>
-  </div>
-</div>
-{% endmacro %}
+{% import 'macros.html' as macros %}
 
 <!DOCTYPE HTML>
 <html>
@@ -116,7 +96,7 @@ <h4 class="modal-title" id="{{key}}-label">{{title}}</h4>
     {% block main %}
     {% endblock %}
 
-    {% call modal('Error', btn_label='OK') %}
+    {% call macros.modal_dlg('Error', btn_label='OK') %}
       <div class="ajax-error">
         The error
       </div>