diff --git a/vulture_os/applications/templates/apps/logfwd_LogOMElasticSearch.html b/vulture_os/applications/templates/apps/logfwd_LogOMElasticSearch.html
index 96e56c4b3..3dc5f4faf 100644
--- a/vulture_os/applications/templates/apps/logfwd_LogOMElasticSearch.html
+++ b/vulture_os/applications/templates/apps/logfwd_LogOMElasticSearch.html
@@ -19,40 +19,49 @@
       <div class="col-md-12">
         <form id="frontend_edit_form" class="form-horizontal bootstrap-validator-form" action="" method="post" novalidate="novalidate">
           {% csrf_token %}
-          <div class="panel">
+          {% if save_error or form.non_field_errors %}
+          <div class="panel panel-danger">
             <div class="panel-heading">
-                <h1 class="panel-title"><i class="fa fa-sitemap">&nbsp;</i>{% translate "Elasticsearch Log forwarder" %}</h1>
+              {# If there is save/configuration errors #}
+              {% if save_error %}
+                <ul class="nav nav-tabs pull-right ui-sortable-handle">
+                  <li class="active"><a href="#tab_1" data-toggle="tab">{% translate "Message" %}</a></li>
+                  <li><a href="#tab_2" data-toggle="tab">{% translate "Advanced informations" %}</a></li>
+                </ul>
+                <h4 class="panel-title">{% translate "Configuration error" %}</h4>
+              {% endif %}
+              {% if form.non_field_errors %}
+                <h4 class="panel-title"><i class="icon fa fa-ban"></i> {% translate "Form errors" %} </h4>
+              {% endif %}
             </div>
             <div class="panel-body">
               {# Print form errors correctly #}
               {% if form.non_field_errors %}
-                <div class="alert alert-danger alert-dismissible">
-                  <h4><i class="icon fa fa-ban"></i> Form errors </h4>
-                  <div class="tab-content no-padding">
-                    {{ form.non_field_errors|safe }}
-                  </div>
+                <div class="alert alert-danger">
+                  {{ form.non_field_errors|safe }}
                 </div>
               {% endif %}
               {# If there is save/configuration errors #}
               {% if save_error %}
-                <div class="alert alert-danger alert-dismissible nav-tabs-custom">
-                  <ul class="nav nav-tabs pull-right ui-sortable-handle">
-                    <li><a href="#tab_2" data-toggle="tab">Advanced informations</a></li>
-                    <li class="active"><a href="#tab_1" data-toggle="tab">Message</a></li>
-                    <li class="pull-left header"><i class="fa fa-inbox"></i>Configuration error</li>
-                  </ul>
+                <div>
                   <div class="tab-content no-padding">
                     <div class="tab-pane active" id="tab_1">
-                      <pre>{{ save_error.0 }}</pre>
-                    </div>
-                    <!-- /.tab-pane -->
+                      <pre class="console-type">{{ save_error.0 }}</pre>
+                    </div> <!-- /.tab-pane -->
                     <div class="tab-pane" id="tab_2">
-                      <pre>{{ save_error.1 }}</pre>
-                    </div>
-                    <!-- /.tab-pane -->
+                      <pre class="console-type">{{ save_error.1 }}</pre>
+                    </div> <!-- /.tab-pane -->
                   </div>
                 </div>
               {% endif %}
+            </div>
+          </div>
+          {% endif %}
+          <div class="panel">
+            <div class="panel-heading">
+                <h1 class="panel-title"><i class="fa fa-sitemap">&nbsp;</i>{% translate "Elasticsearch Log forwarder" %}</h1>
+            </div>
+            <div class="panel-body">
               <div class="row">
                 <div class="col-md-12">
                   <div class="form-group">
diff --git a/vulture_os/services/frontend/views.py b/vulture_os/services/frontend/views.py
index f3431d274..9e5f63e06 100644
--- a/vulture_os/services/frontend/views.py
+++ b/vulture_os/services/frontend/views.py
@@ -363,7 +363,7 @@ def render_form(front, **kwargs):
                 reputationctx_ids = json_loads(request.POST.get('reputation_contexts', "[]"))
             assert isinstance(reputationctx_ids, list), "reputation_contexts field must be a list."
         except Exception as e:
-            return render_form(frontend, save_error=["Error in ReputationConext field : {}".format(e),
+            return render_form(frontend, save_error=["Error in ReputationContext field : {}".format(e),
                                                      str.join('', format_exception(*exc_info()))])
 
         """ For each reputation_context in list """
diff --git a/vulture_os/services/templates/services/frontend_edit.html b/vulture_os/services/templates/services/frontend_edit.html
index e2795e194..4f6fff3c5 100644
--- a/vulture_os/services/templates/services/frontend_edit.html
+++ b/vulture_os/services/templates/services/frontend_edit.html
@@ -35,7 +35,7 @@ <h4 class="panel-title"><i class="icon fa fa-ban"></i> {% translate "Form errors
             <div class="panel-body">
               {# Print form errors correctly #}
               {% if form.non_field_errors %}
-                <div>
+                <div class="alert alert-danger">
                   {{ form.non_field_errors|safe }}
                 </div>
               {% endif %}
@@ -56,6 +56,9 @@ <h4 class="panel-title"><i class="icon fa fa-ban"></i> {% translate "Form errors
           </div>
           {% endif %}
           <div class="panel">
+            <div class="panel-heading">
+                <h1 class="panel-title"><i class="fa fa-sitemap">&nbsp;</i>{% translate "Listeners" %}</h1>
+            </div>
             <div class="panel-body">
               <div class="nav-tabs-custom nav-tabs-no-margin">
                 <ul class="nav nav-tabs">
diff --git a/vulture_os/system/templates/system/tls_profile_edit.html b/vulture_os/system/templates/system/tls_profile_edit.html
index cd14790e8..1e17005ea 100644
--- a/vulture_os/system/templates/system/tls_profile_edit.html
+++ b/vulture_os/system/templates/system/tls_profile_edit.html
@@ -19,40 +19,47 @@
       <div class="col-md-12">
         <form id="tls_edit_form" class="form-horizontal bootstrap-validator-form" action="" method="post" novalidate="novalidate">
           {% csrf_token %}
-          <div class="panel">
+          <div class="panel panel-danger">
             <div class="panel-heading">
-                <h1 class="panel-title"><i class="fa fa-sitemap">&nbsp;</i>{% translate "TLS Profile" %}</h1>
+              {# If there is save/configuration errors #}
+              {% if save_error %}
+                <ul class="nav nav-tabs pull-right ui-sortable-handle">
+                  <li class="active"><a href="#tab_1" data-toggle="tab">{% translate "Message" %}</a></li>
+                  <li><a href="#tab_2" data-toggle="tab">{% translate "Advanced informations" %}</a></li>
+                </ul>
+                <h4 class="panel-title">{% translate "Configuration error" %}</h4>
+              {% endif %}
+              {% if form.non_field_errors %}
+                <h4 class="panel-title"><i class="icon fa fa-ban"></i> {% translate "Form errors" %} </h4>
+              {% endif %}
             </div>
             <div class="panel-body">
               {# Print form errors correctly #}
               {% if form.non_field_errors %}
-                <div class="alert alert-danger alert-dismissible">
-                  <h4><i class="icon fa fa-ban"></i> {% translate "Form errors" %} </h4>
-                  <div class="tab-content no-padding">
-                    {{ form.non_field_errors|safe }}
-                  </div>
+                <div class="alert alert-danger">
+                  {{ form.non_field_errors|safe }}
                 </div>
               {% endif %}
               {# If there is save/configuration errors #}
               {% if save_error %}
-                <div class="alert alert-danger alert-dismissible nav-tabs-custom">
-                  <ul class="nav nav-tabs pull-right ui-sortable-handle">
-                    <li><a href="#tab_2" data-toggle="tab">{% translate "Advanced informations" %}</a></li>
-                    <li class="active"><a href="#tab_1" data-toggle="tab">{% translate "Message" %}</a></li>
-                    <li class="pull-left header"><i class="fa fa-inbox"></i>{% translate "Configuration error" %}</li>
-                  </ul>
+                <div>
                   <div class="tab-content no-padding">
                     <div class="tab-pane active" id="tab_1">
-                      <pre>{{ save_error.0 }}</pre>
-                    </div>
-                    <!-- /.tab-pane -->
+                      <pre class="console-type">{{ save_error.0 }}</pre>
+                    </div> <!-- /.tab-pane -->
                     <div class="tab-pane" id="tab_2">
-                      <pre>{{ save_error.1 }}</pre>
-                    </div>
-                    <!-- /.tab-pane -->
+                      <pre class="console-type">{{ save_error.1 }}</pre>
+                    </div> <!-- /.tab-pane -->
                   </div>
                 </div>
               {% endif %}
+            </div>
+          </div>
+          <div class="panel">
+            <div class="panel-heading">
+                <h1 class="panel-title"><i class="fa fa-sitemap">&nbsp;</i>{% translate "TLS Profile" %}</h1>
+            </div>
+            <div class="panel-body">
               <div class="nav-tabs-custom nav-tabs-no-margin">
                 <ul class="nav nav-tabs">
                   <li class="active"><a href="#tab_general" data-toggle="tab">{% translate "General" %}</a></li>