diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-sections/content-sections.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-sections/content-sections.xhtml
index 124fa8acb..7a8026c34 100644
--- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-sections/content-sections.xhtml
+++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-sections/content-sections.xhtml
@@ -33,13 +33,15 @@
                                 <span>#{CmsAdminMessages['contentsections.list.nav.link.title']}</span>
                             </a>
                         </li>
-                        <li class="nav-item">
-                            <a class="nav-link #{activePage == 'pages'} ? 'active' : ''}"
-                               href="#{mvc.basePath}/pages">
-                                <bootstrap:svgIcon icon="diagram-3" />
-                                <span>#{CmsAdminMessages['contentsections.pages.nav.link.title']}</span>
-                            </a>
-                        </li>
+                        <c:if test="#{UserInfo.admin}">
+                            <li class="nav-item">
+                                <a class="nav-link #{activePage == 'pages'} ? 'active' : ''}"
+                                   href="#{mvc.basePath}/pages">
+                                    <bootstrap:svgIcon icon="diagram-3" />
+                                    <span>#{CmsAdminMessages['contentsections.pages.nav.link.title']}</span>
+                                </a>
+                            </li>
+                        </c:if>
                         <li class="nav-item">
                             <a class="nav-link #{activePage == 'search'} ? 'active' : ''}"
                                href="#{mvc.basePath}/search">
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-sections/list.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-sections/list.xhtml
index b7a9e07a2..2b391699b 100644
--- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-sections/list.xhtml
+++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-sections/list.xhtml
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html [<!ENTITY times '&#215;'>]>
 <html xmlns="http://www.w3.org/1999/xhtml" 
       xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
@@ -17,13 +17,75 @@
             <div class="container">
                 <h1>#{CmsAdminMessages['contentsections.list.label']}</h1>
 
-                <div class="text-right mb-2">
-                    <a class="btn btn-secondary"
-                       href="#{mvc.basePath}/new">
-                        <bootstrap:svgIcon icon="plus-circle" />
-                        <span>#{CmsAdminMessages['contentsections.list.add']}</span>
-                    </a>
-                </div>
+                <c:if test="#{UserInfo.admin}">
+                    <div class="text-right mb-2">
+                        <!--                        <a class="btn btn-secondary"
+                                                   href="#{mvc.basePath}/new">
+                                                    <bootstrap:svgIcon icon="plus-circle" />
+                                                    <span>#{CmsAdminMessages['contentsections.list.add']}</span>
+                                                </a>-->
+                        <button class="btn btn-secondary"
+                                data-toggle="modal"
+                                data-target="#new-content-section-dialog"
+                                type="button">
+                            <bootstrap:svgIcon icon="plus-circle" />
+                            <span>#{CmsAdminMessages['contentsections.list.add']}</span>
+                        </button>
+                    </div>
+                    <div aria-hidden="true"
+                         aria-labelledby="new-content-section-dialog-title"
+                         class="modal fade"
+                         id="new-content-section-dialog"
+                         tabindex="-1">
+                        <div class="modal-dialog">
+                            <form action="#{mvc.basePath}/new"
+                                  class="modal-content"
+                                  method="post">
+                                <div class="modal-header">
+                                    <h2 class="modal-title"
+                                        id="new-content-section-dialog-title">
+                                        #{CmsAdminMessages['contentsections.new_dialog.title']}
+                                    </h2>
+                                    <button aria-label="#{CmsAdminMessages['contentsections.new_dialog.close']}"
+                                            class="close"
+                                            data-dismiss="modal"
+                                            type="button">
+                                        <span aria-hidden="true">&times;</span>
+                                    </button>
+                                </div>
+                                <div class="modal-body">
+                                    <div class="form-group">
+                                        <label for="contentsection-name">
+                                            #{CmsAdminMessages['contentsections.new_dialog.name.label']}
+                                        </label>
+                                        <input aria-describedby="contentsection-name-help"
+                                               class="form-control" 
+                                               id="content-section-name"
+                                               name="contentSectionName"
+                                               pattern="^([a-z0-9-_]*)$"
+                                               type="text" 
+                                               value="" />
+                                        <small class="form-text text-muted"
+                                               id="contentsection-name-help">
+                                            #{CmsAdminMessages['contentsections.new_dialog.name.help']}
+                                        </small>
+                                    </div>
+                                </div>
+                                <div class="modal-footer">
+                                    <button class="btn btn-danger"
+                                            data-dismiss="modal"
+                                            type="button">
+                                        #{CmsAdminMessages['contentsections.new_dialog.close']}
+                                    </button>
+                                    <button class="btn btn-success" 
+                                            type="submit">
+                                        #{CmsAdminMessages['contentsections.new_dialog.save']}
+                                    </button>
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                </c:if>
                 <table class="table table-hover">
                     <thead class="thead-light">
                         <tr>
diff --git a/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages.properties b/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages.properties
index e6f3a4ae9..6a5f1e7dc 100644
--- a/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages.properties
+++ b/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages.properties
@@ -8,3 +8,8 @@ contentsections.list.add=Add Content Section
 contentsections.list.table.headers.label=Name
 contentsections.list.table.headers.actions=Actions
 contentsections.list.table.actions.show_details=Details
+contentsections.new_dialog.title=Create new content section
+contentsections.new_dialog.close=Cancel
+contentsections.new_dialog.save=Create new content section
+contentsections.new_dialog.name.label=Name
+contentsections.new_dialog.name.help=The name of the new content section. Can only contain the letters a to z, the numbers 0-9, the hyphen and the underscore.
diff --git a/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages_de.properties b/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages_de.properties
index 9da5a5146..13ed12ccb 100644
--- a/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages_de.properties
+++ b/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages_de.properties
@@ -8,3 +8,8 @@ contentsections.list.add=Content Section hinzuf\u00fcgen
 contentsections.list.table.headers.label=Name
 contentsections.list.table.headers.actions=Aktionen
 contentsections.list.table.actions.show_details=Details
+contentsections.new_dialog.title=Neue Content Section erstellen
+contentsections.new_dialog.close=Abbrechen
+contentsections.new_dialog.save=Neue Content Section anlegen
+contentsections.new_dialog.name.label=Name
+contentsections.new_dialog.name.help=Der Name der neuen Content Section. Darf nur die Zeichen a bis z, 0-9, the Bindestrich und den Unterstrich enthalten.
