diff --git a/peach-web/templates/device.html.tera b/peach-web/templates/device.html.tera
index 35556ca..9b31333 100644
--- a/peach-web/templates/device.html.tera
+++ b/peach-web/templates/device.html.tera
@@ -126,14 +126,7 @@
{{ flash_msg }}.
- {%- elif flash_msg and flash_name == "error" -%}
-
- {{ flash_msg }}.
- {%- endif %}
+ {% include "snippets/flash_message" %}
{%- endblock card %}
diff --git a/peach-web/templates/login.html.tera b/peach-web/templates/login.html.tera
index 3e66791..072e5fb 100644
--- a/peach-web/templates/login.html.tera
+++ b/peach-web/templates/login.html.tera
@@ -14,17 +14,7 @@
-
- {% if flash_msg and flash_name == "success" %}
-
- {{ flash_msg }}.
- {%- elif flash_msg and flash_name == "info" %}
-
- {{ flash_msg }}.
- {%- elif flash_msg and flash_name == "error" %}
-
- {{ flash_msg }}.
- {%- endif -%}
+ {% include "snippets/flash_message" %}
Forgot Password?
diff --git a/peach-web/templates/messages.html.tera b/peach-web/templates/messages.html.tera
index 36f6fed..394f0b0 100644
--- a/peach-web/templates/messages.html.tera
+++ b/peach-web/templates/messages.html.tera
@@ -4,18 +4,9 @@
-
- {%- if flash_msg and flash_name == "success" %}
-
-
{{ flash_msg }}.
- {%- elif flash_msg and flash_name == "error" %}
-
-
{{ flash_msg }}.
- {%- endif %}
-
-
+ {% include "snippets/flash_message" %}
+
+ {% include "snippets/noscript" %}
{%- endblock card -%}
diff --git a/peach-web/templates/network_add.html.tera b/peach-web/templates/network_add.html.tera
index e73a5d2..aaa47ad 100644
--- a/peach-web/templates/network_add.html.tera
+++ b/peach-web/templates/network_add.html.tera
@@ -14,23 +14,9 @@
-
- {% if flash_msg and flash_name == "success" %}
-
- {{ flash_msg }}.
- {%- elif flash_msg and flash_name == "info" %}
-
- {{ flash_msg }}.
- {%- elif flash_msg and flash_name == "error" %}
-
- {{ flash_msg }}.
- {%- endif -%}
-
- {{ flash_msg }}.
- {%- elif flash_msg and flash_name == "info" %}
-
- {{ flash_msg }}.
- {%- elif flash_msg and flash_name == "error" %}
-
-
-
- {%- if flash_msg and flash_name == "success" %}
-
-
{{ flash_msg }}
- {%- elif flash_msg and flash_name == "info" %}
-
-
{{ flash_msg }}
- {%- elif flash_msg and flash_name == "error" %}
-
-
{{ flash_msg }}
- {%- endif %}
+ {% include "snippets/flash_message" %}
diff --git a/peach-web/templates/network_detail.html.tera b/peach-web/templates/network_detail.html.tera
index 89b8493..c58b5de 100644
--- a/peach-web/templates/network_detail.html.tera
+++ b/peach-web/templates/network_detail.html.tera
@@ -66,17 +66,7 @@
Cancel
-
- {%- if flash_msg and flash_name == "success" %}
-
-
{{ flash_msg }}
- {%- elif flash_msg and flash_name == "info" %}
-
-
{{ flash_msg }}
- {%- elif flash_msg and flash_name == "error" %}
-
-
{{ flash_msg }}
- {%- endif -%}
+ {% include "snippets/flash_message" %}
diff --git a/peach-web/templates/network_modify.html.tera b/peach-web/templates/network_modify.html.tera
index 4c9e5ef..3c9b18c 100644
--- a/peach-web/templates/network_modify.html.tera
+++ b/peach-web/templates/network_modify.html.tera
@@ -14,17 +14,7 @@
-
- {%- if flash_msg and flash_name == "success" %}
-
- {{ flash_msg }}.
- {%- elif flash_msg and flash_name == "info" %}
-
- {{ flash_msg }}.
- {%- elif flash_msg and flash_name == "error" %}
-
- {{ flash_msg }}.
- {%- endif -%}
+ {% include "snippets/flash_message" %}
diff --git a/peach-web/templates/network_usage.html.tera b/peach-web/templates/network_usage.html.tera
index db87620..2c0ac65 100644
--- a/peach-web/templates/network_usage.html.tera
+++ b/peach-web/templates/network_usage.html.tera
@@ -41,17 +41,7 @@
{{ flash_msg }}.
- {%- elif flash_msg and flash_name == "info" %}
-
- {{ flash_msg }}.
- {%- elif flash_msg and flash_name == "error" %}
-
- {{ flash_msg }}.
- {%- endif -%}
+ {% include "snippets/flash_message" %}
{%- endblock card %}
diff --git a/peach-web/templates/peers.html.tera b/peach-web/templates/peers.html.tera
index 8a61b4f..b78906f 100644
--- a/peach-web/templates/peers.html.tera
+++ b/peach-web/templates/peers.html.tera
@@ -10,15 +10,6 @@
{{ flash_msg }}.
- {%- elif flash_msg and flash_name == "error" %}
-
- {{ flash_msg }}.
- {%- endif %}
{%- endblock card -%}
diff --git a/peach-web/templates/profile.html.tera b/peach-web/templates/profile.html.tera
index ff6b97c..aac58f0 100644
--- a/peach-web/templates/profile.html.tera
+++ b/peach-web/templates/profile.html.tera
@@ -27,13 +27,6 @@
{{ flash_msg }}.
- {%- elif flash_msg and flash_name == "error" %}
-
- {{ flash_msg }}.
- {%- endif %}
+ {% include "snippets/flash_message" %}
{%- endblock card -%}
diff --git a/peach-web/templates/shutdown.html.tera b/peach-web/templates/shutdown.html.tera
index f2c8c50..12b450c 100644
--- a/peach-web/templates/shutdown.html.tera
+++ b/peach-web/templates/shutdown.html.tera
@@ -10,20 +10,9 @@
{{ flash_msg }}.
- {%- elif flash_msg and flash_name == "error" %}
-
- {{ flash_msg }}.
- {%- endif %}
-
-