diff --git a/helios/templates/election_view.html b/helios/templates/election_view.html
index 75914983ca27ad47ed5ee3a80482d25c4ef70d2d..288029fbbdacd81e01c27db5601f5befb87ff971 100644
--- a/helios/templates/election_view.html
+++ b/helios/templates/election_view.html
@@ -6,7 +6,7 @@
   <h3 class="title">{{ election.name }}
 {% if admin_p %}
 {% if not election.frozen_at %}
-<a class="small button" href="{% url helios.views.one_election_edit election.uuid %}">edit</a>
+<small><a class="small button" href="{% url helios.views.one_election_edit election.uuid %}">edit</a></small>
 {% endif %}
 {% endif %}</h3>
 <p style="padding-top:0px; margin-top:0px">
diff --git a/helios/views.py b/helios/views.py
index aaa752a1e1c21a6849f584d3f43852f935eabc46..8d9d453e0f40d239e1d50c6bb99746335afde4ee 100644
--- a/helios/views.py
+++ b/helios/views.py
@@ -367,8 +367,8 @@ def socialbuttons(request):
 ##
 ## As of July 2009, there are always trustees for a Helios election: one trustee is acceptable, for simple elections.
 ##
-@json
 @election_view()
+@json
 def list_trustees(request, election):
   trustees = Trustee.get_by_election(election)
   return [t.toJSONDict(complete=True) for t in trustees]
@@ -486,8 +486,8 @@ def trustee_upload_pk(request, election, trustee):
 ## Ballot Management
 ##
 
-@json
 @election_view()
+@json
 def get_randomness(request, election):
   """
   get some randomness to sprinkle into the sjcl entropy pool
@@ -498,8 +498,8 @@ def get_randomness(request, election):
     #"randomness" : base64.b64encode(uuid.uuid4().bytes + uuid.uuid4().bytes)
     }
 
-@json
 @election_view(frozen=True)
+@json
 def encrypt_ballot(request, election):
   """
   perform the ballot encryption given answers_json, a JSON'ified list of list of answers
diff --git a/server_ui/media/foundation-tweaks.css b/server_ui/media/foundation-tweaks.css
index d412c5d4cab37fd04a170c460d5db2fdc730c87f..25aea739fffa12a80ec0f6db1a5e3fe3edf8f383 100644
--- a/server_ui/media/foundation-tweaks.css
+++ b/server_ui/media/foundation-tweaks.css
@@ -58,4 +58,8 @@ margin: 0 auto -4.5em;
 }
 .footer, .push {
 height: 4.5em;
+}
+
+select {
+    width: auto;
 }
\ No newline at end of file