diff --git a/resources/views/partials/menu.twig b/resources/views/partials/menu.twig
index 91dcf46..c8301b6 100644
--- a/resources/views/partials/menu.twig
+++ b/resources/views/partials/menu.twig
@@ -13,68 +13,6 @@
             {% for section in template.cp.sections.root().visible() %}
                 {{ menu.sections(template.cp.sections, section) }}
             {% endfor %}
-
-            {% set submenus = getSubmenus(template.module.namespace) %}
-
-            {% if count(submenus) %}
-                {% for addon in submenus %}
-                    <li class="dropdown d-inline-block">
-                        <a type="button" data-toggle="dropdown">
-                            {{ addon.name }}
-                            <span class="caret"></span></a>
-                        <ul class="dropdown-menu ml-0 my-0 py-0"
-                            style="position: relative; background-color: transparent !important; border: 0;padding-left: 1.3rem">
-
-                            {% for navigation in addon.links %}
-                                <li>
-                                    <a href="{{ url(navigation.href) }}"
-                                       style="font-size: 14px;color: #ccc !important;">
-                                        {{ trans(navigation.title) }}
-                                    </a>
-                                </li>
-                            {% endfor %}
-                        </ul>
-                    </li>
-                {% endfor %}
-
-            {% endif %}
-        {% else %}
-
-            {% set menu = getSections(parent) %}
-            {% set main_menu = menu['main'] %}
-            {% set sub_menus = menu['sub_menus'] %}
-
-            {% for navigation in main_menu %}
-                <li>
-                    <a href="{{ url(navigation.href) }}">
-                        {{ trans(navigation.title) }}
-                    </a>
-                </li>
-            {% endfor %}
-
-            {% if count(sub_menus) %}
-                {% for addon in sub_menus %}
-                    <li class="dropdown d-inline-block">
-                        <a type="button" data-toggle="dropdown">
-                            {{ addon.name }}
-                            <span class="caret"></span></a>
-                        <ul class="dropdown-menu ml-0 my-0 py-0"
-                            style="position: relative; background-color: transparent !important; border: 0;padding-left: 1.3rem">
-
-                            {% for navigation in addon.links %}
-                                <li>
-                                    <a href="{{ url(navigation.href) }}"
-                                       style="font-size: 14px;color: #ccc !important;">
-                                        {{ trans(navigation.title) }}
-                                    </a>
-                                </li>
-                            {% endfor %}
-                        </ul>
-                    </li>
-                {% endfor %}
-
-            {% endif %}
-
         {% endif %}
     </ul>
 </aside>
\ No newline at end of file
diff --git a/resources/views/partials/messages.twig b/resources/views/partials/messages.twig
index 61a24b2..7e51213 100644
--- a/resources/views/partials/messages.twig
+++ b/resources/views/partials/messages.twig
@@ -2,7 +2,7 @@
 {% if message_exists('important') %}
     <div class="alert alert-danger">
         {% for message in message_pull('important') %}
-            {{ trans(message)|markdown }}
+            {{ trans(message) }}
         {% endfor %}
     </div>
 {% endif %}
@@ -14,7 +14,7 @@
             <span>&times;</span>
         </button>
         {% for message in message_pull('success') %}
-            {{ trans(message)|markdown }}
+            {{ trans(message) }}
         {% endfor %}
     </div>
 {% endif %}
@@ -26,7 +26,7 @@
             <span>&times;</span>
         </button>
         {% for message in message_pull('info') %}
-            {{ trans(message)|markdown }}
+            {{ trans(message) }}
         {% endfor %}
     </div>
 {% endif %}
@@ -38,7 +38,7 @@
             <span>&times;</span>
         </button>
         {% for message in message_pull('warning') %}
-            {{ trans(message)|markdown }}
+            {{ trans(message) }}
         {% endfor %}
     </div>
 {% endif %}
@@ -50,7 +50,7 @@
             <span>&times;</span>
         </button>
         {% for message in message_pull('error') %}
-            {{ trans(message)|markdown }}
+            {{ trans(message) }}
         {% endfor %}
     </div>
 {% endif %}
diff --git a/resources/views/partials/search-box.twig b/resources/views/partials/search-box.twig
index 62be2ed..cf06c46 100644
--- a/resources/views/partials/search-box.twig
+++ b/resources/views/partials/search-box.twig
@@ -12,16 +12,6 @@
                         {{ trans(navigation.breadcrumb) }}
                 </span>
             </a>
-
-            {% set sections = getSections(navigation.slug) %}
-            {% for section in sections['main'] %}
-                <a class="dropdown-item" href="{{ section.href }}">
-                    <span class="title">
-                        - {{ trans(section.title) }}
-                        <span style="color:transparent; font-size: 14px;"> ( {{ trans(navigation.breadcrumb) }} ) </span>
-                    </span>
-                </a>
-            {% endfor %}
         {% endfor %}
     </div>
 </form>