diff --git a/templates/modify_applet.html b/templates/modify_applet.html
index 1027961..0158e0f 100644
--- a/templates/modify_applet.html
+++ b/templates/modify_applet.html
@@ -1,22 +1,50 @@
 {% extends theme("layout.html") %}
+{% block head_scripts %}
+{{ super() }}
+<script type="text/javascript">
+var selectedTab;
+
+selectTab = function(tabId) {
+    if (selectedTab)
+        $('#' + selectedTab).hide();
+
+    if (selectedTab == tabId) {
+        selectedTab = null;
+        return;
+    }
+
+    $('#' + tabId).show();
+    selectedTab = tabId;
+}
+</script>
+{% endblock %}
 {% block content %}
 <h1>{{ _("Modifying %(item_name)s", item_name=item_name) }}</h1>
 <div class="moin-form">
 <form action="" method="POST" enctype="multipart/form-data">
 <input type="hidden" name="action" value="modify" />
 <input type="hidden" name="rev" value="{{ revno }}" />
-{% block extra_form %}{% endblock %}
+{% block extra_form %}
+<input class="button tab-button" type="button" name="button_upload" value="{{ _("Upload") }}" onclick="selectTab('tab_upload');" />
+<input class="button tab-button" type="button" name="button_metadata" value="{{ _("Metadata") }}" onclick="selectTab('tab_metadata');" >
+<input class="button tab-button" type="button" name="button_help" value="{{ _("Help") }}" onclick="selectTab('tab_help');" />
+{% endblock %}
+<div id="tabs">
+    {% block extra_tabs %}{% endblock %}
+    <div id="tab_upload" style="display: none;">
+        <dl>
+                <label for="data_file">{{ _("Upload file:") }}</label>
+                <input type="file" id="data_file" name="data_file" />
+        </dl>
+    </div>
+    <div id="tab_metadata" style="display: none;">
+        <textarea name="meta_text" lang="en" dir="ltr" rows="{{ rows_meta }}" cols="{{ cols }}">{{ meta_text }}</textarea>
+    </div>
+    <div id="tab_help" style="display: none;">
+        <pre>{{ help }}</pre>
+    </div>
+</div>
 {% block data_editor %}{% endblock %}
-    <dl>
-        <dt>
-            <label for="data_file">{{ _("Upload file:") }}</label>
-         </dt>
-         <dd>
-            <input type="file" id="data_file" name="data_file" />
-        </dd>
-    </dl>
-<pre>{{ help }}</pre>
-<textarea name="meta_text" lang="en" dir="ltr" rows="{{ rows_meta }}" cols="{{ cols }}">{{ meta_text }}</textarea>
 </form>
 </div>
 {% endblock %}
diff --git a/templates/modify_binary.html b/templates/modify_binary.html
index e3c06ca..a55dc39 100644
--- a/templates/modify_binary.html
+++ b/templates/modify_binary.html
@@ -3,8 +3,13 @@
 {% block extra_form %}
 <input class="button" type="submit" name="button_save" value="{{ _("Save") }}" />
 <input class="button" type="submit" name="button_cancel" value="{{ _("Cancel") }}" />
+<input class="button" type="button" name="button_comment" value="{{ _("Comment") }}" onclick="selectTab('tab_comment');" />
+{{ super() }}
 {{ forms.render_textcha(gen, form) }}
 <br />
-<label for="comment">{{ _("Comment:") }}</label><input type="text" id="comment" name="comment" size="80" maxlength="200" value="{{ comment }}" />
-<br />
+{% endblock %}
+{% block extra_tabs %}
+<div id="tab_comment" style="display: none;">
+    <label for="comment">{{ _("Comment:") }}</label><input type="text" id="comment" name="comment" size="80" maxlength="200" value="{{ comment }}" />
+</div>
 {% endblock %}