--- a/Allura/allura/templates/app_admin_options.html
+++ b/Allura/allura/templates/app_admin_options.html
@@ -1,38 +1,22 @@
-{% extends g.theme.master %}
-
-{% block title %}{{c.project.name}} / {{app.config.options.mount_label}} / Options{% endblock %}
-
-{% block header %}{{app.config.options.mount_point}} Options{% endblock %}
-
-{% block content %}
- <form method="post" action="configure">
- <ol>
- {% for o in app.config_options if o.name not in ['mount_point', 'mount_label', 'ordinal'] %}
- <li><label for="{{o.name}}" class="span-3">{{o.name}}</label>
- {% if not allow_config %}
- <div>
- {{app.config.options.get(o.name, o.default)}}
- </div>
- {% else%}
- <div class="editable viewing" style="min-height:1em;">
- <div class="viewer">{{app.config.options.get(o.name, o.default)}}</div>
- <div class="editor"><input name="{{o.name}}" value="{{app.config.options.get(o.name, o.default)}}"/></div>
- </div>
- {% endif %}
- </li>
- {% else %}
- <li>No options to administer for {{app.config.options.mount_point}}.</li>
- {% endfor %}
-
- <li>
- <label> </label>
- {% if allow_config %}
- <input type="submit" value="Update config" />
- {% if app.installable %}
- <input type="submit" name="delete" value="Delete Tool" />
- {% endif %}
- {% endif %}
- </li>
- </ol>
- </form>
-{% endblock %}
+<form method="post" action="{{c.project.url()}}admin/{{app.config.options.mount_point}}/configure">
+ {% for o in app.config_options if o.name not in ['mount_point', 'mount_label', 'ordinal'] %}
+ <label for="{{o.name}}" class="grid-4">{{o.name}}</label>
+ <div class="grid-9">
+ {% if not allow_config %}
+ {{app.config.options.get(o.name, o.default)}}
+ {% else%}
+ <input name="{{o.name}}" value="{{app.config.options.get(o.name, o.default)}}">
+ {% endif %}
+ </div>
+ {% else %}
+ <p>No options to administer for {{app.config.options.mount_point}}.</p>
+ {% endfor %}
+ {% if allow_config %}
+ <div class="grid-13"> </div>
+ <hr>
+ <div class="grid-13"> </div>
+ <div class="grid-13">
+ <input type="submit" value="Save"/>
+ </div>
+ {% endif %}
+</form>