diff --git a/ippisite/ippidb/static/css/admin-session.css b/ippisite/ippidb/static/css/admin-session.css
index c7d7ec82684f173523964a572835d8167a219d59..1060b4919c69b94b6592876b8f9c20258cf2d247 100644
--- a/ippisite/ippidb/static/css/admin-session.css
+++ b/ippisite/ippidb/static/css/admin-session.css
@@ -126,21 +126,30 @@ Description: IPPI-DB Theme
 #id_IdForm-source {
   overflow: hidden;
   padding-bottom: 5px;
+  display:flex;
 }
 
-#id_IdForm-source label span{
-  display: inline-block;
-  width: 164px;
+#id_IdForm-source label{
+    flex:1 auto;
+    margin-left: 5px;
+}
+
+#id_IdForm-source label:first-child{
+    margin-left: 0px;
+}
+
+#id_IdForm-source label div{
   background-color: #E8E0E0;
   color: #8D8888;
   text-align: center;
+  border: 1px solid #E3E9EB;
 }
 
 #id_IdForm-source input {
   display:none;
 }
 
-#id_IdForm-source input:hover+label span{
+#id_IdForm-source input:hover+label div{
   cursor: pointer;
   background-color: #FFFFFF;
   color: #000000;
@@ -150,7 +159,7 @@ Description: IPPI-DB Theme
   border-right: 1px solid #E3E9EB;
 }
 
-#id_IdForm-source input[type="radio"]:checked+label span{
+#id_IdForm-source input[type="radio"]:checked+label div{
   background-color: #FFFFFF;
   color: #000000;
   border-bottom: 1px solid #2D96FA;
diff --git a/ippisite/ippidb/templates/IdForm.html b/ippisite/ippidb/templates/IdForm.html
index 4ab45eece4c5ff7f8e043bb46e53eb02ef80dbb9..2f048864af1594d4503ac4001a3a144f611ddc45 100644
--- a/ippisite/ippidb/templates/IdForm.html
+++ b/ippisite/ippidb/templates/IdForm.html
@@ -18,7 +18,7 @@
 						{% for radio in wizard.form.source %}
 					    	  	{{ radio.tag }}
 					        	<label for="{{ radio.id_for_label }}">
-					        		<span>{{ radio.choice_label }}</span>
+					        		<div>{{ radio.choice_label }}</div>
 					    		</label>
 						{% endfor %}
 					</div>