diff --git a/webapp/static/css/webapp_kaehmy.css b/webapp/static/css/webapp_kaehmy.css
index 635e63f..710269e 100644
--- a/webapp/static/css/webapp_kaehmy.css
+++ b/webapp/static/css/webapp_kaehmy.css
@@ -24,3 +24,12 @@ div.tooltip-inner {
     width: auto;
     margin-bottom: 1rem;
 }
+
+.kaehmy-content {
+    padding-left: 0.5rem;
+    padding-right: 0.5rem;
+}
+
+p {
+    overflow-wrap: break-word;
+}
\ No newline at end of file
diff --git a/webapp/templates/kaehmy_base.html b/webapp/templates/kaehmy_base.html
index 8df04f7..fdd50ac 100644
--- a/webapp/templates/kaehmy_base.html
+++ b/webapp/templates/kaehmy_base.html
@@ -38,9 +38,10 @@
             {% include "kaehmy_navigation.html" %}
         {% endblock %}
 
-        {% block content %}
-        {% endblock %}
-
+        <div class="kaehmy-content">
+            {% block content %}
+            {% endblock %}
+        </div>
         <div class="footer">
             {% block footer %}
                 {% include "kaehmy_footer.html" %}
diff --git a/webapp/templates/kaehmy_message.html b/webapp/templates/kaehmy_message.html
index be9c260..f3a15fd 100644
--- a/webapp/templates/kaehmy_message.html
+++ b/webapp/templates/kaehmy_message.html
@@ -3,7 +3,7 @@
 <div class="card" style="margin-top: 0.5rem; margin-bottom: 0">
     <div class="card-block">
         <h4>{{ message.name }}</h4>
-        <p>{{ message.message|linebreaks }}</p>
+        <p>{{ message.message|linebreaks|urlize }}</p>
 
         <h6 class="card-subtitle mb-2 text-muted">{{ message.timestamp }}</h6>
         <div>