diff --git a/src/moin/templates/layout.html b/src/moin/templates/layout.html
index 938b738cb..17a995955 100644
--- a/src/moin/templates/layout.html
+++ b/src/moin/templates/layout.html
@@ -52,7 +52,7 @@
         </header>
         {{ after_header }}
 
-        <div id="moin-page" role="main">
+        <div id="moin-page" role="main" lang="{{ theme_supp.content_lang }}" dir="{{ theme_supp.content_dir }}">
             {% block item -%}
                 {# If you want itemviews in your template, extend from show.html, not from here. #}
                 <div id="moin-content">
diff --git a/src/moin/themes/focus/static/css/theme.css b/src/moin/themes/focus/static/css/theme.css
index fb1be7525..7adbf0d8d 100644
--- a/src/moin/themes/focus/static/css/theme.css
+++ b/src/moin/themes/focus/static/css/theme.css
@@ -7,18 +7,12 @@
     --negative: #cc4343;
 }
 
-@font-face {
-    font-family: 'JetBrains Mono';
-    src: url('../fonts/JetBrainsMono-Regular.woff2') format('woff2');
-    font-weight: normal;
-    font-style: normal;
-}
-
 html { background-color: white; }
 html * { box-sizing: border-box; }
 html, body { max-width: 100vw; max-height: 100vh; overflow-x: hidden;}
 h1, h2, h3, h4, h5, h6 { border-bottom: none; }
 h2 { margin-top: 1.6em; margin-bottom: 0.5em; }
+table tr td { border: none; }
 .clickable-header { cursor: pointer; }
 input[type="checkbox"] { appearance: none; border: 2pt solid #242424;
     height: 12pt; width: 12pt; transition: background-color 80ms linear; }
@@ -28,6 +22,7 @@ input[type="checkbox"]:checked { background-color: var(--accent-light); }
 .moin-logo { text-align: start; }
 .moin-sitename { display: flex; margin-top: 4pt; margin-bottom: 10pt;
     font-size: 1.4rem; font-weight: 600; white-space: normal; }
+#toggle-header { display: none; background-color: transparent; border: none; min-width: 25px; }
 #moin-username, #moin-navibar { display: flex; flex-direction: column; row-gap: 6pt; margin-bottom: 8pt; }
 #moin-username a, #moin-navibar a { width: 90%; display: block; padding: 4pt; border-radius: 2pt; }
 #moin-username a:hover, #moin-navibar a:hover,
@@ -45,7 +40,7 @@ input[type="checkbox"]:checked { background-color: var(--accent-light); }
 
 #moin-page { min-width: 0pt; }
 
-header { min-width: 140pt; min-height: 100vh; margin-right: 18pt; padding: 8pt;
+header { min-width: 140pt; width: 220px; min-height: 100vh; margin-right: 18pt; padding: 8pt;
     box-shadow: 2pt 0pt 10pt 2pt rgba(0, 0, 0, 0.1); }
 header ol, header ul { padding-left: 0pt; }
 header li::marker { display: none; }
@@ -163,7 +158,7 @@ header a, header a:link, header a:visited,
 .moin-form button, .moin-button, .moin-form input[type="submit"] { display: flex;
     align-items: center; justify-content: center; }
 
-.moin-edit-content { font-family: "JetBrains Mono", monospace; font-variant-ligatures: none;
+.moin-edit-content { font-family: monospace; font-variant-ligatures: none;
     margin-top: 6pt; }
 
 #moin-modify input[type="file"] { color: #383838; font-size: 0.9rem; cursor: pointer; }
@@ -226,7 +221,7 @@ div.warning > ul, div.warning > p { padding-left: 30pt; }
     min-width: 40pt; }
 .moin-tags a:link:hover, .moin-tags a:visited:hover { color: white; background-color: var(--accent-hover) }
 
-#moin-global-history tr td { border: none; }
+.moin-history-end-of-day { border-top: none; }
 .moin-history-day-banner { background-color: var(--accent-lighter); }
 
 #moin-content table > thead { background-color: var(--accent-lighter); }
@@ -274,10 +269,20 @@ tr > th { background-color: var(--accent-lighter); }
 
 @media (max-width: 700pt) {
     #moin-main-wrapper { flex-direction: column; }
-    header { min-height: unset; margin-right: 0pt; }
+    header { min-height: unset; margin-right: 0pt; width: 100%; }
     header a { white-space: initial; }
+    h1, h2, h3 { margin-top: 20px; margin-bottom: 10px; }
+    #moin-header-top { display: flex; justify-content: space-between; margin-bottom: 10pt; }
+    #moin-logo-sitename { display: flex; gap: 3pt; }
+    #moin-logo, #moin-logo * { max-width: 26pt; height: auto; }
     .moin-sitename { font-size: 1.2rem; }
-    #moin-content { padding: 0pt 8pt; }
+    #toggle-header { display: revert; }
+    #moin-content { padding: 0pt 8pt; margin-top: 10pt; }
+    #moin-username, #moin-searchform, #moin-navibar, .moin-breadcrumb { display: none; background-color: #eeeefe; }
+    #moin-searchform input { background-color: transparent; }
+    #moin-username, #moin-navibar, #moin-searchform { margin: 0; padding: 4pt 2pt; }
+    #moin-searchform { width: 100%; }
+    .moin-breadcrumb { margin: 0; padding: 14pt 4pt; }
 
     #moin-username, #moin-navibar { flex-direction: row; flex-wrap: wrap; }
     #moin-username a, #moin-navibar a { display: flex; column-gap: 6pt; white-space: nowrap; }
@@ -285,11 +290,7 @@ tr > th { background-color: var(--accent-lighter); }
 
     #moin-content-data { margin-right: 0pt; }
 
-    #top-bar { height: fit-content; }
-    #top-bar .moin-itemviews.panel.mobile { display: flex; }
-    #top-bar .moin-itemviews.panel.desktop { display: none; }
-    #top-bar .fa { display: none; }
-    #top-bar, #top-bar-menu-content { position: relative; }
+    #top-bar { position: sticky; height: fit-content; padding: 0 8pt; }
     #usersettings_ui, #moin-usersettings form { width: unset; }
     #moin-usersettings dl { column-gap: 10pt; row-gap: 6pt; max-width: 100vw; }
     #moin-usersettings dt { max-width: 44vw; }
diff --git a/src/moin/themes/focus/static/fonts/JetBrainsMono-Regular.woff2 b/src/moin/themes/focus/static/fonts/JetBrainsMono-Regular.woff2
deleted file mode 100644
index fdf95dde6..000000000
Binary files a/src/moin/themes/focus/static/fonts/JetBrainsMono-Regular.woff2 and /dev/null differ
diff --git a/src/moin/themes/focus/static/js/main.js b/src/moin/themes/focus/static/js/main.js
index f96d55de8..3d48779b3 100644
--- a/src/moin/themes/focus/static/js/main.js
+++ b/src/moin/themes/focus/static/js/main.js
@@ -47,15 +47,37 @@ window.onload = function () {
 
     // Close menu in top bar when user clicks on something else
     const topbarMenu = document.getElementById('top-bar-menu')
-
-    topbarMenu.addEventListener('click', (event) => {
-        event.stopPropagation()
-    })
+    if (topbarMenu) {
+        topbarMenu.addEventListener('click', (event) => {
+            event.stopPropagation()
+        })
+    }
 
     document.body.addEventListener('click', () => {
         const topbarMenuSwitch = document.getElementById('top-bar-menu-switch')
-        if (topbarMenuSwitch.checked) {
-            topbarMenuSwitch.click()
+        if (topbarMenuSwitch?.checked) {
+            topbarMenuSwitch?.click()
         }
     })
+
+    const toggleVisibility = (element, visibleClass) => {
+        if (element) {
+            if (element.style.display === "none" || element.style.display === "") {
+                element.style.display = visibleClass ?? "block";
+            } else {
+                element.style.display = "none";
+            }
+        }
+    }
+
+    document.querySelector("#toggle-header")?.addEventListener("click", () => {
+        const userName = document.querySelector("#moin-username")
+        const search = document.querySelector("#moin-searchform")
+        const navibar = document.querySelector("#moin-navibar")
+        const breadcrumb = document.querySelector(".moin-breadcrumb")
+        toggleVisibility(userName, "flex")
+        toggleVisibility(search, "flex")
+        toggleVisibility(navibar, "flex")
+        toggleVisibility(breadcrumb)
+    })
 }
\ No newline at end of file
diff --git a/src/moin/themes/focus/templates/itemviews.html b/src/moin/themes/focus/templates/itemviews.html
index 30cdef79e..91bea6776 100644
--- a/src/moin/themes/focus/templates/itemviews.html
+++ b/src/moin/themes/focus/templates/itemviews.html
@@ -7,7 +7,6 @@
     Comment and Transclusion links may be hidden by Javascript if item lacks content.
 #}
 
-{% set exists = fqname and storage.get_item(**fqname.query) %}
 {% set item = item %}
 {% set not_trash =  not item_is_deleted if item_is_deleted is defined else True %}
 {% set icon_classes = theme_supp.get_endpoint_iconmap() %}
@@ -18,10 +17,9 @@
     <span>{{ label }}</span>
 {%- endmacro %}
 
-<div class="moin-itemviews panel desktop">
+<div class="moin-itemviews panel">
     {%- for endpoint, label, title, check_exists in cfg.item_views if not endpoint in cfg.endpoints_excluded %}
         {% set icon_class = icon_classes[endpoint] %}
-        {%- if not check_exists or check_exists and exists %}
             {%- if  may.write and not_trash %}
                 {%- if current_path.startswith("/+")
                     and endpoint == 'frontend.show_item'
@@ -36,8 +34,6 @@
                     </div>
                 {%- endif %}
             {%- endif %}
-
-        {%- endif %}
     {%- endfor %}
     <div id="top-bar-menu">
         <input id="top-bar-menu-switch" type="checkbox" />
@@ -50,137 +46,24 @@
         <div id="top-bar-menu-content">
             {%- for endpoint, label, title, check_exists in cfg.item_views if not endpoint in cfg.endpoints_excluded %}
             {% set icon_class = icon_classes[endpoint] %}
-            {%- if not check_exists or check_exists and exists %}
-                {%- if  may.write
-                    and not_trash
-                    and endpoint == 'frontend.modify_item'
-                    and current_path.startswith("/+")
-                    and not current_path.startswith("/+modify/")
-                %}
-                    <div>
-                        <a class="moin-modify-button" href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, label) }}</a>
-                    </div>
-                {%- endif %}
-                {%- if endpoint in [
-                    'frontend.show_item_meta',
-                    'frontend.history',
-                    'frontend.download_item',
-                ] %}
-                    <div>
-                        <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, label) }}</a>
-                    </div>
-                {%- endif %}
-
-                {%- if not_trash and endpoint in [
-                    'frontend.index',
-                    'frontend.refs',
-                    'frontend.sitemap',
-                    'frontend.similar_names',
-                    'frontend.copy_item',
-                ] %}
-                    <div>
-                        <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, label) }}</a>
-                    </div>
-                {%- endif %}
-
-                {%- if endpoint == 'frontend.highlight_item' and item and ('text' in item.contenttype or 'docbook' in item.contenttype) %}
-                    <div>
-                        <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, label) }}</a>
-                    </div>
-                {%- endif %}
-
-                {%- if endpoint in [
-                    'frontend.rename_item', 'frontend.delete_item',
-                ] and may.write and not_trash %}
-                    <div>
-                        <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, label) }}</a>
-                    </div>
-                {%- endif %}
-
-                {%- if endpoint in [
-                    'frontend.convert_item',
-                ] and may.write and item and theme_supp.is_markup_or_text(item.contenttype) and not_trash %}
-                    <div>
-                        <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, label) }}</a>
-                    </div>
-                {%- endif %}
-
-                {%- if endpoint == 'frontend.destroy_item' and user.may.destroy(fqname) %}
-                    <div>
-                        <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, label) }}</a>
-                    </div>
-                {%- endif %}
-
-                {%- if endpoint == 'frontend.quicklink_item' and user.valid and not_trash %}
-                    <div>
-                        <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">
-                            {%- if user.is_quicklinked_to([fqname]) %}
-                                {{ a_label(icon_class, _('Remove Link')) }}
-                            {%- else %}
-                                {{ a_label(icon_class, _('Add Link')) }}
-                            {%- endif %}
-                        </a>
-                    </div>
-                {%- endif %}
-
-                {%- if endpoint == 'frontend.subscribe_item' and user.valid and not_trash %}
-                    <div>
-                        <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">
-                            {%- if user.is_subscribed_to(item) %}
-                                {{ a_label(icon_class, _('Unsubscribe')) }}
-                            {%- else %}
-                                {{ a_label(icon_class, _('Subscribe')) }}
-                            {%- endif %}
-                        </a>
-                    </div>
-                {%- endif %}
-
-                {%- if endpoint == 'special.comments' and not_trash %}
-                    <div class="moin-toggle-comments-button">
-                        <a class="moin-toggle-comments-tooltip" href="#" title="{{ title }}">{{ a_label(icon_class, label) }}</a>
-                    </div>
-                {%- endif %}
-
-                {% if endpoint == 'special.transclusions' and not_trash -%}
-                    <div class="moin-transclusions-button">
-                        <a class="moin-transclusions-tooltip" href="#" title="{{ title }}">{{ a_label(icon_class, label) }}</a>
-                    </div>
-                {%- endif %}
-
-                {%- if endpoint == 'special.supplementation' and fqname %}
-                    {%- for sub_item_name in cfg.supplementation_item_names %}
-                        {%- set current_sub = item_name.rsplit('/', 1)[-1] %}
-                        {%- if not current_sub in cfg.supplementation_item_names %}
-                            {%- set supp_name = '%s/%s/%s' % (fqname.namespace, item_name, sub_item_name) %}
-                            {%- if not_trash and (storage.has_item(supp_name) or user.may.write(supp_name)) %}
-                                {% set title = _('Discuss contents of this item') %}
-                                <div>
-                                    <a class="moin-subitem-discuss" href="{{ url_for('frontend.show_item', item_name=supp_name) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, _(sub_item_name)) }}</a>
-                                </div>
-                            {%- endif %}
-                        {%- endif %}
-                    {%- endfor %}
-                {%- endif %}
+            {%- if  may.write
+                and not_trash
+                and endpoint == 'frontend.modify_item'
+                and current_path.startswith("/+")
+                and not current_path.startswith("/+modify/")
+            %}
+                <div>
+                    <a class="moin-modify-button" href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, label) }}</a>
+                </div>
             {%- endif %}
-            {%- endfor %}
-        </div>
-    </div>
-</div>
-
-<ul class="moin-itemviews panel mobile">
-    <li class="moin-panel-heading">{{ _('Item Views') }}</li>
-    {%- for endpoint, label, title, check_exists in cfg.item_views if not endpoint in cfg.endpoints_excluded %}
-        {% set icon_class = icon_classes[endpoint] %}
-        {%- if not check_exists or check_exists and exists %}
             {%- if endpoint in [
-                'frontend.show_item',
                 'frontend.show_item_meta',
                 'frontend.history',
                 'frontend.download_item',
             ] %}
-                <li>
+                <div>
                     <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, label) }}</a>
-                </li>
+                </div>
             {%- endif %}
 
             {%- if not_trash and endpoint in [
@@ -190,47 +73,41 @@
                 'frontend.similar_names',
                 'frontend.copy_item',
             ] %}
-                <li>
+                <div>
                     <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, label) }}</a>
-                </li>
+                </div>
             {%- endif %}
 
             {%- if endpoint == 'frontend.highlight_item' and item and ('text' in item.contenttype or 'docbook' in item.contenttype) %}
-                <li>
+                <div>
                     <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, label) }}</a>
-                </li>
-            {%- endif %}
-
-            {%- if endpoint == 'frontend.modify_item' and may.write and not_trash %}
-                <li>
-                    <a class="moin-modify-button" href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, label) }}</a>
-                </li>
+                </div>
             {%- endif %}
 
             {%- if endpoint in [
                 'frontend.rename_item', 'frontend.delete_item',
             ] and may.write and not_trash %}
-                <li>
+                <div>
                     <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, label) }}</a>
-                </li>
+                </div>
             {%- endif %}
 
             {%- if endpoint in [
                 'frontend.convert_item',
             ] and may.write and item and theme_supp.is_markup_or_text(item.contenttype) and not_trash %}
-                <li>
+                <div>
                     <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, label) }}</a>
-                </li>
+                </div>
             {%- endif %}
 
             {%- if endpoint == 'frontend.destroy_item' and user.may.destroy(fqname) %}
-                <li>
+                <div>
                     <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, label) }}</a>
-                </li>
+                </div>
             {%- endif %}
 
             {%- if endpoint == 'frontend.quicklink_item' and user.valid and not_trash %}
-                <li>
+                <div>
                     <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">
                         {%- if user.is_quicklinked_to([fqname]) %}
                             {{ a_label(icon_class, _('Remove Link')) }}
@@ -238,11 +115,11 @@
                             {{ a_label(icon_class, _('Add Link')) }}
                         {%- endif %}
                     </a>
-                </li>
+                </div>
             {%- endif %}
 
             {%- if endpoint == 'frontend.subscribe_item' and user.valid and not_trash %}
-                <li>
+                <div>
                     <a href="{{ url_for(endpoint, item_name = fqname) }}" title="{{ title }}" rel="nofollow">
                         {%- if user.is_subscribed_to(item) %}
                             {{ a_label(icon_class, _('Unsubscribe')) }}
@@ -250,19 +127,19 @@
                             {{ a_label(icon_class, _('Subscribe')) }}
                         {%- endif %}
                     </a>
-                </li>
+                </div>
             {%- endif %}
 
             {%- if endpoint == 'special.comments' and not_trash %}
-                <li class="moin-toggle-comments-button">
+                <div class="moin-toggle-comments-button">
                     <a class="moin-toggle-comments-tooltip" href="#" title="{{ title }}">{{ a_label(icon_class, label) }}</a>
-                </li>
+                </div>
             {%- endif %}
 
             {% if endpoint == 'special.transclusions' and not_trash -%}
-                <li class="moin-transclusions-button">
+                <div class="moin-transclusions-button">
                     <a class="moin-transclusions-tooltip" href="#" title="{{ title }}">{{ a_label(icon_class, label) }}</a>
-                </li>
+                </div>
             {%- endif %}
 
             {%- if endpoint == 'special.supplementation' and fqname %}
@@ -272,14 +149,14 @@
                         {%- set supp_name = '%s/%s/%s' % (fqname.namespace, item_name, sub_item_name) %}
                         {%- if not_trash and (storage.has_item(supp_name) or user.may.write(supp_name)) %}
                             {% set title = _('Discuss contents of this item') %}
-                            <li>
+                            <div>
                                 <a class="moin-subitem-discuss" href="{{ url_for('frontend.show_item', item_name=supp_name) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, _(sub_item_name)) }}</a>
-                            </li>
+                            </div>
                         {%- endif %}
                     {%- endif %}
                 {%- endfor %}
             {%- endif %}
-        {%- endif %}
-    {%- endfor %}
-</ul>
-
+            {%- endfor %}
+        </div>
+    </div>
+</div>
diff --git a/src/moin/themes/focus/templates/layout.html b/src/moin/themes/focus/templates/layout.html
index 48220f814..c208176c1 100644
--- a/src/moin/themes/focus/templates/layout.html
+++ b/src/moin/themes/focus/templates/layout.html
@@ -16,18 +16,25 @@
     <script src="/_themes/focus/js/main.js"></script>
     <div id="moin-main-wrapper">
         {{ before_header }}
-        <header id="moin-header">
+        <header id="moin-header" lang="{{ theme_supp.user_lang }}" dir="{{ theme_supp.user_dir }}">
             {% block header %}
-                {% if logo %}
-                    <div id="moin-logo">
-                        <a href="{{ url_for('frontend.show_item', item_name=cfg.root_mapping.get('', cfg.default_root)) }}">{{ logo }}</a>
+                <div id="moin-header-top">
+                    <div id="moin-logo-sitename">
+                        {% if logo %}
+                            <div id="moin-logo">
+                                <a href="{{ url_for('frontend.show_item', item_name=cfg.root_mapping.get('', cfg.default_root)) }}">{{ logo }}</a>
+                            </div>
+                        {% endif %}
+                        {% if cfg.sitename %}
+                            <a class="moin-sitename" href="{{ url_for('frontend.show_item', item_name=cfg.item_root) }}">
+                                {{ cfg.sitename }}
+                            </a>
+                        {% endif %}
                     </div>
-                {% endif %}
-                {% if cfg.sitename %}
-                    <a class="moin-sitename" href="{{ url_for('frontend.show_item', item_name=cfg.item_root) }}">
-                        {{ cfg.sitename }}
-                    </a>
-                {% endif %}
+                    <button type="button" id="toggle-header" title="Toggle menu" class="navbar-toggle">
+                        <i class="fa fa-bars"></i>
+                    </button>
+                </div>
                 <div id="moin-username">
                     {%- if user.valid -%}
                         {%- set avatar = user.avatar(20) %}
@@ -86,7 +93,6 @@
                     - if an item is not in the default namespace, the namespace will be prefixed to the item name
                     - last item on page trail must show individual links to all parent items
                 #}
-                <!--{{ utils.breadcrumbs(theme_supp.path_breadcrumbs, title_name) }}-->
                 <div class="moin-breadcrumb">
                     <div class="moin-panel-heading"><i>{{ _('Page Trail') }}</i></div>
                     {%- set trail_items = theme_supp.path_breadcrumbs() %}
@@ -97,7 +103,6 @@
                                 <li>
                                     {{ utils.page_trail_link(wiki_name, fqname) }}
                                     {{ utils.alias_list(aliases) }}
-                                    <!--<i class="fa fa-angle-double-right fa-fw"></i>-->
                                 </li>
                             {%- endif %}
                             {%- if loop.last %}
diff --git a/src/moin/themes/focus/templates/modify.html b/src/moin/themes/focus/templates/modify.html
index 644ef29c0..c8e6a2f93 100644
--- a/src/moin/themes/focus/templates/modify.html
+++ b/src/moin/themes/focus/templates/modify.html
@@ -3,8 +3,8 @@
     changes to a text item, or create a new wiki item.
 
     Based upon content type, the data_editor macro that is passed will generate a
-    file upload option and/or a text editor, or specialized drawing tools to
-    create/modify twikidraw, anywikidraw, svgdraw items.
+    file upload option and/or a text editor, or specialized a drawing tool to
+    create/modify svgdraw items.
 
     If a new item, this page is displayed after the user navigates through a series of web pages to:
         * select item type (modify_select_itemtype.html), user may select default, ticket, blog
@@ -17,7 +17,7 @@
 
 {% extends theme("show.html") %}
 
-{% from form.meta_template import meta_editor %}
+{% from form.meta_template import meta_editor with context %}
 {# Import macros data_editor and extra_head from content_form's template.
    extra_head is optional, so instead of a simple "import from" we need to do
    this manually #}
@@ -25,7 +25,7 @@
 {% set extra_head = content_template.extra_head %}
 {% set data_editor = content_template.data_editor %}
 
-{% set title = _("Modifying '%(item_name)s'", item_name=fqname|shorten_fqname) %}
+{% set title = _("Modifying '{item_name}'").format(item_name=fqname|shorten_fqname) %}
 
 {% block head %}
     {{ super() }}
@@ -93,13 +93,13 @@ <h1>{{ title }}</h1>
 
 {% block options_for_javascript %}
     {%- if user.scroll_page_after_edit -%}
-        <br id="moin-scroll-page-after-edit" />
+        <br id="moin-scroll-page-after-edit">
     {%- endif %}
     {%- if draft_data -%}
         <textarea id="moin-draft-data">{{ draft_data }}</textarea>
     {%- endif %}
     {%- if lock_duration -%}
-        <input id="moin-lock_duration" value="{{ lock_duration }}" />
+        <input id="moin-lock_duration" value="{{ lock_duration }}">
     {%- endif %}
-    <input id="moin-item-name" value="{{ fqname }}" />
+    <input id="moin-item-name" value="{{ fqname }}">
 {% endblock %}
diff --git a/src/moin/themes/focus/templates/show.html b/src/moin/themes/focus/templates/show.html
index 200654933..e152a2c22 100644
--- a/src/moin/themes/focus/templates/show.html
+++ b/src/moin/themes/focus/templates/show.html
@@ -8,10 +8,10 @@
 
 {% block head_links %}
     {{ super() }}
-    <link rel="alternate" title="{{ item_name }} changes" href="{{ url_for('feed.atom', item_name=item_name) }}" type="application/atom+xml" />
+    <link rel="alternate" title="{{ item_name }} changes" href="{{ url_for('feed.atom', item_name=item_name) }}" type="application/atom+xml">
     {# universal edit button support #}
     {%- if may.write and 'frontend.modify_item' not in cfg.endpoints_excluded -%}
-        <link rel="alternate" type="application/wiki" title="{{ _('Modify') }}" href="{{ url_for('frontend.modify_item', item_name=item_name) }}" />
+        <link rel="alternate" type="application/wiki" title="{{ _('Modify') }}" href="{{ url_for('frontend.modify_item', item_name=item_name) }}">
     {%- endif %}
 {% endblock %}
 
@@ -26,7 +26,7 @@
         {% if item.meta['summary'] %}
             {% block item_summary %}
                 <div class="moin-summary">
-                    {{ _('Summary: %(summary)s', summary=item.meta['summary']) }}
+                    {{ _('Summary: {summary}').format(summary=item.meta['summary']) }}
                 </div>
             {% endblock %}
         {% endif %}
@@ -49,10 +49,10 @@
 {% endblock %}
 
 {% block options_for_javascript %}
-    {%- if item_name and user.edit_on_doubleclick and may.write -%}
-        <br id="moin-edit-on-doubleclick" />
+    {%- if item_name and user.edit_on_doubleclick and may.write and data_rendered and not form -%}
+        <br id="moin-edit-on-doubleclick">
     {%- endif %}
     {%- if user.show_comments -%}
-        <br id="moin-show-comments" />
+        <br id="moin-show-comments">
     {%- endif %}
 {% endblock %}