diff --git a/templates/web/account_wizard.tt2.html b/templates/web/account_wizard.tt2.html
index 1b4698e5bc0a70cc1fc9b3bad7e4f2e438d7a489..60501f0bf86b9e52dacc6d8304c1f96a3b142a08 100644
--- a/templates/web/account_wizard.tt2.html
+++ b/templates/web/account_wizard.tt2.html
@@ -97,7 +97,7 @@ jQuery(document).ready(function($){
 
       <h3>Select your Service Provider</h3>
 <fieldset>
-    <legend>Select your Service Provider</legend>
+    <h3>Select your Service Provider</h3>
 <div>
 This Test Identity Provider allows you to create test accounts with different profiles to validate the behaviour of your own Service Provider registered
 in eduGAIN inter-federation. Note that only a Service Provider administrator can create accounts here.
@@ -105,7 +105,7 @@ in eduGAIN inter-federation. Note that only a Service Provider administrator can
 
 <label for="sp_entityid">Please select your Service Provider below</label>
     
-    <select  id="sp_entityid" name="sp_entityid" class="required">
+    <select id="sp_entityid" name="sp_entityid" class="required">
         <option value="">Select your Service Provider below</option>
         [% FOREACH entity IN federation_metadata_as_hashref.sort('default_display_name') %]
 <option value="[% entity.entityid %]">[% IF entity.default_display_name %][% entity.default_display_name %] [% END %]([% entity.entityid %])</option>
diff --git a/templates/web/index.tt2.html b/templates/web/index.tt2.html
index b6a63f510420e3abe7199be242116a07f089690f..888364eccac233219a80633cd7b76b716482c2f5 100644
--- a/templates/web/index.tt2.html
+++ b/templates/web/index.tt2.html
@@ -62,6 +62,9 @@ div.important{border-style:solid;border-color:black;border-width:1px;background-
 .mandatory{color:#e00853;font-style:italic;font-weight:bold;margin:0 3px}
 .notice{border:2px solid #05a;padding:5px 5px 5px 5px;margin:20px;}
 #sp_entityid{width:100%;}
+.scrollable{overflow-y: scroll;}
+fieldset.scrollable{height: 75%;}
+.wizard .content div.radio_inline input[type="radio"]{display: inline;}
 --></STYLE>
 <title> [% PROCESS 'templates/web/title.tt2.html' %] </title>
 
diff --git a/templates/web/select_sp.tt2.html b/templates/web/select_sp.tt2.html
index 6a8dd5a652edd55345838e4dde051c1737b08962..394051ed187bdec4b2840e7455ca89563aadfe76 100644
--- a/templates/web/select_sp.tt2.html
+++ b/templates/web/select_sp.tt2.html
@@ -8,7 +8,7 @@
 Before you can create test accounts at this Identity Provider, we need to ensure you are a legitimate administrator of "[% sp_display_name %]".
 </div>
 
-<fieldset>
+<fieldset class="scrollable">
 [% IF  sp_metadata_as_hashref.contacts.defined %]
     <legend>Select your email address</legend>
    <label for="sp_entityid">The email addresses below have been extracted from your SP SAML metadata.<br/>Please select the email address where an email challenge
@@ -24,12 +24,14 @@ Before you can create test accounts at this Identity Provider, we need to ensure
 [% contacts.${email} = 1 %]
 [% END %]
 
+<div class="radio_inline">
 [% FOREACH email IN contacts.keys.sort %]
-<input name="email_address" value="[% email %]" id="email_address" type="radio" class="required"/><label for="email_address">[% email %]</label>
+<input name="email_address" value="[% email %]" type="radio" class="required"/><label for="email_address">[% email %]</label><br/>
 
 <input type="hidden" name="sp_entityid" value="[% sp_metadata_as_hashref.entityid %]" id="sp_entityid"/>
 
 [% END %]
+</div>
 
 [% ELSE %]
 No ContactPerson elements could be found in your SP SAML metadata. Therefore we are unable to provide test accounts for your SP. Please contact your local federation