diff --git a/css/swad16.106.5.css b/css/swad16.108.css
similarity index 99%
rename from css/swad16.106.5.css
rename to css/swad16.108.css
index 53936bff7..6da809cd9 100644
--- a/css/swad16.106.5.css
+++ b/css/swad16.108.css
@@ -435,6 +435,11 @@ a:hover						/* Default ==> underlined */
 .GREY_COURSE	{color:#F7F6F5;}
 .BLUE_COURSE	{color:white;}
 .YELLOW_COURSE	{color:white;}
+#my_courses
+	{
+	width:130px;
+	margin:1px;
+	}
 
 /***************************** Notifications *********************************/
 #msg	/* Notifications, used for AJAX based refresh */
diff --git a/swad_changelog.h b/swad_changelog.h
index aa1a50469..c5fc3f703 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -189,13 +189,15 @@
 /****************************** Public constants *****************************/
 /*****************************************************************************/
 
-#define Log_PLATFORM_VERSION	"SWAD 16.107.10 (2016-12-27)"
-#define CSS_FILE		"swad16.106.5.css"
+#define Log_PLATFORM_VERSION	"SWAD 16.108 (2016-12-27)"
+#define CSS_FILE		"swad16.108.css"
 #define JS_FILE			"swad16.101.js"
 
 // Number of lines (includes comments but not blank lines) has been got with the following command:
 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
 /*
+        Version 16.108:   Dec 27, 2016	Changes in layout.
+					Changes in behaviour of labels in forms. (211608 lines)
         Version 16.107.10:Dec 27, 2016	Changes in behaviour of labels in forms. (211606 lines)
         Version 16.107.9: Dec 27, 2016	Changes in edition of new notice. (211607 lines)
         Version 16.107.8: Dec 27, 2016	Changes in behaviour of labels in forms. (211598 lines)
diff --git a/swad_course.c b/swad_course.c
index a4fdd93f7..c9022bb84 100644
--- a/swad_course.c
+++ b/swad_course.c
@@ -1103,8 +1103,7 @@ void Crs_WriteSelectorMyCourses (void)
                                                ActSysReqSch);
 
    /***** Start of selector of courses *****/
-   fprintf (Gbl.F.Out,"<select name=\"crs\""
-	              " style=\"width:130px; margin:1px;\""
+   fprintf (Gbl.F.Out,"<select id=\"my_courses\" name=\"crs\""
                       " onchange=\"document.getElementById('%s').submit();\">",
             Gbl.Form.Id);
 
@@ -3345,10 +3344,10 @@ void Crs_AskRemoveOldCrss (void)
    Lay_StartRoundFrame (NULL,Txt_Eliminate_old_courses,NULL,Hlp_SYSTEM_Old);
 
    /***** Form to request number of months without clicks *****/
-   fprintf (Gbl.F.Out,"<span class=\"%s\">%s </span>",
+   fprintf (Gbl.F.Out,"<label class=\"%s\">%s&nbsp;"
+	              "<select name=\"Months\">",
             The_ClassForm[Gbl.Prefs.Theme],
             Txt_Eliminate_all_courses_whithout_users_PART_1_OF_2);
-   fprintf (Gbl.F.Out,"<select name=\"Months\">");
    for (i  = Crs_MIN_MONTHS_WITHOUT_ACCESS_TO_REMOVE_OLD_CRSS;
         i <= Crs_MAX_MONTHS_WITHOUT_ACCESS_TO_REMOVE_OLD_CRSS;
         i++)
@@ -3358,12 +3357,10 @@ void Crs_AskRemoveOldCrss (void)
          fprintf (Gbl.F.Out," selected=\"selected\"");
       fprintf (Gbl.F.Out,">%u</option>",i);
      }
-   fprintf (Gbl.F.Out,"</select>"
-                      "<span class=\"%s\"> ",
-            The_ClassForm[Gbl.Prefs.Theme]);
+   fprintf (Gbl.F.Out,"</select>&nbsp;");
    fprintf (Gbl.F.Out,Txt_Eliminate_all_courses_whithout_users_PART_2_OF_2,
             Cfg_PLATFORM_SHORT_NAME);
-   fprintf (Gbl.F.Out,"</span>");
+   fprintf (Gbl.F.Out,"</label>");
 
    /***** End frame *****/
    Lay_EndRoundFrameWithButton (Lay_REMOVE_BUTTON,Txt_Eliminate);
diff --git a/swad_degree.c b/swad_degree.c
index 84ef11a51..b8555b0f6 100644
--- a/swad_degree.c
+++ b/swad_degree.c
@@ -604,7 +604,8 @@ void Deg_WriteSelectorOfDegree (void)
                Gbl.Form.Id);
    else
       fprintf (Gbl.F.Out," disabled=\"disabled\"");
-   fprintf (Gbl.F.Out,"><option value=\"\"");
+   fprintf (Gbl.F.Out,">"
+	              "<option value=\"\"");
    if (Gbl.CurrentDeg.Deg.DegCod < 0)
       fprintf (Gbl.F.Out," selected=\"selected\"");
    fprintf (Gbl.F.Out," disabled=\"disabled\">[%s]</option>",
diff --git a/swad_enrollment.c b/swad_enrollment.c
index 1e95e532b..a3f4572aa 100644
--- a/swad_enrollment.c
+++ b/swad_enrollment.c
@@ -675,7 +675,7 @@ void Enr_AskRemoveOldUsrs (void)
    Lay_StartRoundFrame (NULL,Txt_Eliminate_old_users,NULL,NULL);
 
    /***** Form to request number of months without clicks *****/
-   fprintf (Gbl.F.Out,"<span class=\"%s\">%s </span>",
+   fprintf (Gbl.F.Out,"<label class=\"%s\">%s&nbsp;",
             The_ClassForm[Gbl.Prefs.Theme],
             Txt_Eliminate_all_users_who_are_not_enrolled_on_any_courses_PART_1_OF_2);
    fprintf (Gbl.F.Out,"<select name=\"Months\">");
@@ -688,12 +688,10 @@ void Enr_AskRemoveOldUsrs (void)
          fprintf (Gbl.F.Out," selected=\"selected\"");
       fprintf (Gbl.F.Out,">%u</option>",Months);
      }
-   fprintf (Gbl.F.Out,"</select>"
-                      "<span class=\"%s\"> ",
-            The_ClassForm[Gbl.Prefs.Theme]);
+   fprintf (Gbl.F.Out,"</select>&nbsp;");
    fprintf (Gbl.F.Out,Txt_Eliminate_all_users_who_are_not_enrolled_on_any_courses_PART_2_OF_2,
             Cfg_PLATFORM_SHORT_NAME);
-   fprintf (Gbl.F.Out,"</span>");
+   fprintf (Gbl.F.Out,"</label>");
 
    /***** End frame *****/
    Lay_EndRoundFrameWithButton (Lay_REMOVE_BUTTON,Txt_Eliminate);
diff --git a/swad_file_browser.c b/swad_file_browser.c
index 029b72e68..c0dcc2d79 100644
--- a/swad_file_browser.c
+++ b/swad_file_browser.c
@@ -9394,14 +9394,16 @@ void Brw_ShowFileMetadata (void)
 
 	 /***** Private or public? *****/
 	 fprintf (Gbl.F.Out,"<tr>"
-			    "<td class=\"%s RIGHT_MIDDLE\">"
+			    "<td class=\"RIGHT_MIDDLE\">"
+			    "<label for=\"PublicFile\" class=\"%s\">"
 			    "%s:"
+			    "</label>"
 			    "</td>"
 			    "<td class=\"DAT LEFT_MIDDLE\">",
 		  The_ClassForm[Gbl.Prefs.Theme],Txt_Availability);
 	 if (ICanChangePublic)	// I can change file to public
 	   {
-	    fprintf (Gbl.F.Out,"<select name=\"PublicFile\">");
+	    fprintf (Gbl.F.Out,"<select id=\"PublicFile\" name=\"PublicFile\">");
 
 	    fprintf (Gbl.F.Out,"<option value=\"N\"");
 	    if (!FileMetadata.IsPublic)
@@ -9424,14 +9426,14 @@ void Brw_ShowFileMetadata (void)
 
 	 /***** License *****/
 	 fprintf (Gbl.F.Out,"<tr>"
-			    "<td class=\"%s RIGHT_MIDDLE\">"
-			    "%s:"
+			    "<td class=\"RIGHT_MIDDLE\">"
+			    "<label for=\"License\" class=\"%s\">%s:</label>"
 			    "</td>"
 			    "<td class=\"DAT LEFT_MIDDLE\">",
 		  The_ClassForm[Gbl.Prefs.Theme],Txt_License);
 	 if (ICanEdit)	// I can edit file properties
 	   {
-	    fprintf (Gbl.F.Out,"<select name=\"License\">");
+	    fprintf (Gbl.F.Out,"<select id=\"License\" name=\"License\">");
 
 	    for (License = 0;
 		 License < Brw_NUM_LICENSES;
@@ -11820,7 +11822,7 @@ void Brw_AskRemoveOldFiles (void)
    Lay_StartRoundFrame (NULL,Txt_Remove_old_files,NULL,NULL);
 
    /***** Form to request number of months (to remove files older) *****/
-   fprintf (Gbl.F.Out,"<span class=\"%s\">%s </span>",
+   fprintf (Gbl.F.Out,"<label class=\"%s\">%s&nbsp;",
             The_ClassForm[Gbl.Prefs.Theme],
             Txt_Remove_files_older_than_PART_1_OF_2);
    fprintf (Gbl.F.Out,"<select name=\"Months\">");
@@ -11833,12 +11835,10 @@ void Brw_AskRemoveOldFiles (void)
          fprintf (Gbl.F.Out," selected=\"selected\"");
       fprintf (Gbl.F.Out,">%u</option>",Months);
      }
-   fprintf (Gbl.F.Out,"</select>"
-                      "<span class=\"%s\"> ",
-            The_ClassForm[Gbl.Prefs.Theme]);
+   fprintf (Gbl.F.Out,"</select>&nbsp;");
    fprintf (Gbl.F.Out,Txt_Remove_files_older_than_PART_2_OF_2,
             Cfg_PLATFORM_SHORT_NAME);
-   fprintf (Gbl.F.Out,"</span>");
+   fprintf (Gbl.F.Out,"</label>");
 
    /***** End frame *****/
    Lay_EndRoundFrameWithButton (Lay_REMOVE_BUTTON,Txt_Remove);
diff --git a/swad_message.c b/swad_message.c
index 7a736b2f2..0e5d1f38f 100644
--- a/swad_message.c
+++ b/swad_message.c
@@ -2536,7 +2536,7 @@ void Msg_ShowFormSelectCourseSentOrRecMsgs (void)
      };
 
    /***** Course selection *****/
-   fprintf (Gbl.F.Out,"<span class=\"%s\">%s </span>"
+   fprintf (Gbl.F.Out,"<label class=\"%s\">%s&nbsp;"
                       "<select name=\"FilterCrsCod\">"
                       "<option value=\"\"",
             The_ClassForm[Gbl.Prefs.Theme],
@@ -2555,7 +2555,8 @@ void Msg_ShowFormSelectCourseSentOrRecMsgs (void)
         fprintf (Gbl.F.Out," selected=\"selected\"");	// Select origin course
       fprintf (Gbl.F.Out,">%s</option>",Gbl.Msg.Courses[NumOriginCrs].ShrtName);
      }
-   fprintf (Gbl.F.Out,"</select>");
+   fprintf (Gbl.F.Out,"</select>"
+	              "</label>");
   }
 
 /*****************************************************************************/
diff --git a/swad_photo.c b/swad_photo.c
index 98353dd6f..ac4cb4e4d 100644
--- a/swad_photo.c
+++ b/swad_photo.c
@@ -1675,8 +1675,8 @@ static void Pho_PutSelectorForTypeOfAvg (void)
    Pho_AvgPhotoTypeOfAverage_t TypeOfAvg;
 
    fprintf (Gbl.F.Out,"<tr>"
-	              "<td class=\"%s RIGHT_MIDDLE\">"
-	              "%s:"
+	              "<td class=\"RIGHT_MIDDLE\">"
+	              "<label for=\"AvgType\" class=\"%s\">%s:</label>"
 	              "</td>"
 	              "<td class=\"LEFT_MIDDLE\">",
 	    The_ClassForm[Gbl.Prefs.Theme],Txt_Average_type);
@@ -1684,7 +1684,7 @@ static void Pho_PutSelectorForTypeOfAvg (void)
    Pho_PutHiddenParamPhotoSize ();
    Pho_PutHiddenParamOrderDegrees ();
    Usr_PutParamColsClassPhoto ();
-   fprintf (Gbl.F.Out,"<select name=\"AvgType\""
+   fprintf (Gbl.F.Out,"<select id=\"AvgType\" name=\"AvgType\""
                       " onchange=\"document.getElementById('%s').submit();\">",
             Gbl.Form.Id);
    for (TypeOfAvg = (Pho_AvgPhotoTypeOfAverage_t) 0;
@@ -1744,8 +1744,8 @@ static void Pho_PutSelectorForHowComputePhotoSize (void)
    Pho_HowComputePhotoSize_t PhoSi;
 
    fprintf (Gbl.F.Out,"<tr>"
-	              "<td class=\"%s RIGHT_MIDDLE\">"
-	              "%s:"
+	              "<td class=\"RIGHT_MIDDLE\">"
+	              "<label for=\"PhotoSize\" class=\"%s\">%s:</label>"
 	              "</td>"
 	              "<td class=\"LEFT_MIDDLE\">",
 	    The_ClassForm[Gbl.Prefs.Theme],Txt_Size_of_photos);
@@ -1753,7 +1753,7 @@ static void Pho_PutSelectorForHowComputePhotoSize (void)
    Pho_PutHiddenParamTypeOfAvg ();
    Pho_PutHiddenParamOrderDegrees ();
    Usr_PutParamColsClassPhoto ();
-   fprintf (Gbl.F.Out,"<select name=\"PhotoSize\""
+   fprintf (Gbl.F.Out,"<select id=\"PhotoSize\" name=\"PhotoSize\""
                       " onchange=\"document.getElementById('%s').submit();\">",
             Gbl.Form.Id);
    for (PhoSi = (Pho_HowComputePhotoSize_t) 0;
@@ -1813,8 +1813,8 @@ static void Pho_PutSelectorForHowOrderDegrees (void)
    Pho_HowOrderDegrees_t Order;
 
    fprintf (Gbl.F.Out,"<tr>"
-	              "<td class=\"%s RIGHT_MIDDLE\">"
-	              "%s:"
+	              "<td class=\"RIGHT_MIDDLE\">"
+	              "<label for=\"OrdDeg\" class=\"%s\">%s:</label>"
 	              "</td>"
 	              "<td class=\"LEFT_MIDDLE\">",
 	    The_ClassForm[Gbl.Prefs.Theme],Txt_Sort_degrees_by);
@@ -1822,7 +1822,7 @@ static void Pho_PutSelectorForHowOrderDegrees (void)
    Pho_PutHiddenParamTypeOfAvg ();
    Pho_PutHiddenParamPhotoSize ();
    Usr_PutParamColsClassPhoto ();
-   fprintf (Gbl.F.Out,"<select name=\"OrdDeg\""
+   fprintf (Gbl.F.Out,"<select id=\"OrdDeg\" name=\"OrdDeg\""
                       " onchange=\"document.getElementById('%s').submit();\">",
             Gbl.Form.Id);
    for (Order = (Pho_HowOrderDegrees_t) 0;
diff --git a/swad_record.c b/swad_record.c
index 8168aff08..598ff3fa6 100644
--- a/swad_record.c
+++ b/swad_record.c
@@ -1409,7 +1409,8 @@ static void Rec_ShowLinkToPrintPreviewOfRecords (void)
    Act_LinkFormSubmit (Txt_Print,The_ClassFormBold[Gbl.Prefs.Theme],NULL);
    Lay_PutIconWithText ("print64x64.png",Txt_Print,Txt_Print);
    fprintf (Gbl.F.Out,"</a>"
-                      "<label class=\"%s\">(<select name=\"RecsPerPag\">",
+                      "<label class=\"%s\">"
+                      "(<select name=\"RecsPerPag\">",
 	    The_ClassForm[Gbl.Prefs.Theme]);
    for (i = 1;
         i <= 10;
@@ -1420,7 +1421,8 @@ static void Rec_ShowLinkToPrintPreviewOfRecords (void)
          fprintf (Gbl.F.Out," selected=\"selected\"");
       fprintf (Gbl.F.Out,">%u</option>",i);
      }
-   fprintf (Gbl.F.Out,"</select> %s)</label>",
+   fprintf (Gbl.F.Out,"</select> %s)"
+	              "</label>",
             Txt_record_cards_per_page);
   }
 
@@ -2731,8 +2733,9 @@ static void Rec_ShowRole (struct UsrData *UsrDat,
       Rol_GetRolesInAllCrssIfNotYetGot (UsrDat);
 
       fprintf (Gbl.F.Out,"<tr>"
-			 "<td class=\"REC_C1_BOT RIGHT_MIDDLE %s\">"
-			 "%s:</td>"
+			 "<td class=\"REC_C1_BOT RIGHT_MIDDLE\">"
+			 "<label for=\"Role\" class=\"%s\">%s:</label>"
+			 "</td>"
 			 "<td class=\"REC_C2_BOT REC_DAT_BOLD LEFT_MIDDLE\">",
 	       ClassForm,Txt_Role);
       switch (TypeOfView)
@@ -2742,7 +2745,7 @@ static void Rec_ShowRole (struct UsrData *UsrDat,
 				       UsrDat->UsrCod == Gbl.CurrentCrs.Crs.RequesterUsrCod) ?	// I am the creator of the course
 				      Rol_TEACHER :
 				      Rol_STUDENT;
-	    fprintf (Gbl.F.Out,"<select name=\"Role\">");
+	    fprintf (Gbl.F.Out,"<select id=\"Role\" name=\"Role\">");
 	    for (Role = Rol_STUDENT;
 		 Role <= Rol_TEACHER;
 		 Role++)
@@ -2756,7 +2759,7 @@ static void Rec_ShowRole (struct UsrData *UsrDat,
 	    fprintf (Gbl.F.Out,"</select>");
 	    break;
 	 case Rec_SHA_OTHER_EXISTING_USR_FORM:	// The other user already exists in the platform
-	    fprintf (Gbl.F.Out,"<select name=\"Role\">");
+	    fprintf (Gbl.F.Out,"<select id=\"Role\" name=\"Role\">");
 	    if (Gbl.CurrentCrs.Crs.CrsCod > 0)	// Course selected
 	      {
 	       if (UsrDat->RoleInCurrentCrsDB < Rol_STUDENT)	// The other user does not belong to current course
@@ -2774,7 +2777,10 @@ static void Rec_ShowRole (struct UsrData *UsrDat,
 		  case Rol__GUEST_:
 		  case Rol_VISITOR:
 		  case Rol_STUDENT:
-		     fprintf (Gbl.F.Out,"<option value=\"%u\" selected=\"selected\" disabled=\"disabled\">%s</option>",
+		     fprintf (Gbl.F.Out,"<option value=\"%u\""
+			                " selected=\"selected\""
+			                " disabled=\"disabled\">"
+			                "%s</option>",
 			      (unsigned) Gbl.Usrs.Me.LoggedRole,
 			      Txt_ROLES_SINGUL_Abc[Gbl.Usrs.Me.LoggedRole][UsrDat->Sex]);
 		     break;
@@ -2817,26 +2823,29 @@ static void Rec_ShowRole (struct UsrData *UsrDat,
 	       DefaultRoleInCurrentCrs = (UsrDat->Roles & ((1 << Rol_STUDENT) |
 							   (1 << Rol_TEACHER))) ? Rol_VISITOR :
 										  Rol__GUEST_;
-	       fprintf (Gbl.F.Out,"<option value=\"%u\" selected=\"selected\" disabled=\"disabled\">%s</option>",
+	       fprintf (Gbl.F.Out,"<option value=\"%u\" selected=\"selected\""
+		                  " disabled=\"disabled\">%s</option>",
 			(unsigned) DefaultRoleInCurrentCrs,
 			Txt_ROLES_SINGUL_Abc[DefaultRoleInCurrentCrs][UsrDat->Sex]);
 	      }
 	    fprintf (Gbl.F.Out,"</select>");
 	    break;
 	 case Rec_SHA_OTHER_NEW_USR_FORM:	// The other user does not exist in platform
-	    fprintf (Gbl.F.Out,"<select name=\"Role\">");
+	    fprintf (Gbl.F.Out,"<select id=\"Role\" name=\"Role\">");
 	    if (Gbl.CurrentCrs.Crs.CrsCod > 0)	// Course selected
 	       switch (Gbl.Usrs.Me.LoggedRole)
 		 {
 		  case Rol_TEACHER:	// A teacher only can create students
-		     fprintf (Gbl.F.Out,"<option value=\"%u\" selected=\"selected\">%s</option>",
+		     fprintf (Gbl.F.Out,"<option value=\"%u\""
+			                " selected=\"selected\">%s</option>",
 			      (unsigned) Rol_STUDENT,Txt_ROLES_SINGUL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN]);
 		     break;
 		  case Rol_DEG_ADM:	// An administrator can create students and teachers in a course
 		  case Rol_CTR_ADM:
 		  case Rol_INS_ADM:
 		  case Rol_SYS_ADM:
-		     fprintf (Gbl.F.Out,"<option value=\"%u\" selected=\"selected\">%s</option>"
+		     fprintf (Gbl.F.Out,"<option value=\"%u\""
+			                " selected=\"selected\">%s</option>"
 					"<option value=\"%u\">%s</option>",
 			      (unsigned) Rol_STUDENT,Txt_ROLES_SINGUL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN],
 			      (unsigned) Rol_TEACHER,Txt_ROLES_SINGUL_Abc[Rol_TEACHER][Usr_SEX_UNKNOWN]);
@@ -2848,7 +2857,8 @@ static void Rec_ShowRole (struct UsrData *UsrDat,
 	       switch (Gbl.Usrs.Me.LoggedRole)
 		 {
 		  case Rol_SYS_ADM:
-		     fprintf (Gbl.F.Out,"<option value=\"%u\" selected=\"selected\">%s</option>",
+		     fprintf (Gbl.F.Out,"<option value=\"%u\""
+			                " selected=\"selected\">%s</option>",
 			      (unsigned) Rol__GUEST_,Txt_ROLES_SINGUL_Abc[Rol__GUEST_][Usr_SEX_UNKNOWN]);
 		     break;
 		  default:	// The rest of users can not register other users
@@ -3033,13 +3043,11 @@ static void Rec_ShowCountry (struct UsrData *UsrDat,
 
    fprintf (Gbl.F.Out,"<tr>"
 		      "<td class=\"REC_C1_BOT RIGHT_MIDDLE\">"
-                      "<label for=\"OthCtyCod\" class=\"%s\">"
-		      "%s",
+                      "<label for=\"OthCtyCod\" class=\"%s\">%s",
 	    ClassForm,Txt_Country);
    if (TypeOfView == Rec_SHA_MY_RECORD_FORM)
       fprintf (Gbl.F.Out,"*");
-   fprintf (Gbl.F.Out,":"
-                      "</label>"
+   fprintf (Gbl.F.Out,":</label>"
 	              "</td>"
 		      "<td colspan=\"2\""
 		      " class=\"REC_C2_BOT LEFT_MIDDLE\">");
@@ -3678,9 +3686,7 @@ void Rec_ShowFormMyInsCtrDpt (void)
    /***** Country *****/
    fprintf (Gbl.F.Out,"<tr>"
 		      "<td class=\"RIGHT_MIDDLE\">"
-                      "<label for=\"OthCtyCod\" class=\"%s\">"
-		      "%s:"
-                      "</label>"
+                      "<label for=\"OthCtyCod\" class=\"%s\">%s:</label>"
 		      "</td>"
 		      "<td class=\"LEFT_MIDDLE\" style=\"width:%upx;\">",
             ClassForm,Txt_Country_of_your_institution,
@@ -3722,9 +3728,7 @@ void Rec_ShowFormMyInsCtrDpt (void)
    /***** Institution *****/
    fprintf (Gbl.F.Out,"<tr>"
 		      "<td class=\"RIGHT_MIDDLE\">"
-                      "<label for=\"OthInsCod\" class=\"%s\">"
-		      "%s:"
-		      "</label>"
+                      "<label for=\"OthInsCod\" class=\"%s\">%s:</label>"
 		      "</td>"
 		      "<td class=\"LEFT_MIDDLE\" style=\"width:%upx;\">",
             ClassForm,Txt_Institution,
@@ -3771,9 +3775,7 @@ void Rec_ShowFormMyInsCtrDpt (void)
       /***** Centre *****/
       fprintf (Gbl.F.Out,"<tr>"
 			 "<td class=\"RIGHT_MIDDLE\">"
-                         "<label for=\"OthCtrCod\" class=\"%s\">"
-			 "%s:"
-                         "</label>"
+                         "<label for=\"OthCtrCod\" class=\"%s\">%s:</label>"
 			 "</td>"
 			 "<td class=\"LEFT_MIDDLE\" style=\"width:%upx;\">",
 	       ClassForm,Txt_Centre,
@@ -3818,9 +3820,7 @@ void Rec_ShowFormMyInsCtrDpt (void)
       /***** Department *****/
       fprintf (Gbl.F.Out,"<tr>"
 			 "<td class=\"RIGHT_MIDDLE\">"
-                         "<label for=\"DptCod\" class=\"%s\">"
-			 "%s:"
-                         "</label>"
+                         "<label for=\"DptCod\" class=\"%s\">%s:</label>"
 			 "</td>"
 			 "<td class=\"LEFT_MIDDLE\" style=\"width:%upx;\">",
 	       ClassForm,Txt_Department,
diff --git a/swad_role.c b/swad_role.c
index 63909c732..299ae3097 100644
--- a/swad_role.c
+++ b/swad_role.c
@@ -292,7 +292,7 @@ void Rol_PutFormToChangeMyRole (void)
    Rol_Role_t Role;
 
    Act_FormStart (ActChgMyRol);
-   fprintf (Gbl.F.Out,"<select name=\"UsrTyp\" class=\"SEL_ROLE\""
+   fprintf (Gbl.F.Out,"<select name=\"MyRole\" class=\"SEL_ROLE\""
                       " onchange=\"document.getElementById('%s').submit();\">",
             Gbl.Form.Id);
    for (Role = Rol__GUEST_;
@@ -320,7 +320,7 @@ void Rol_ChangeMyRole (void)
    unsigned UnsignedNum;
 
    /***** Get parameter with the new logged role ******/
-   Par_GetParToText ("UsrTyp",UnsignedStr,10);
+   Par_GetParToText ("MyRole",UnsignedStr,10);
    if (sscanf (UnsignedStr,"%u",&UnsignedNum) == 1)
      {
       /* Check if new role is a correct type *****/
diff --git a/swad_statistic.c b/swad_statistic.c
index fe57ec535..e610277d0 100644
--- a/swad_statistic.c
+++ b/swad_statistic.c
@@ -2061,8 +2061,7 @@ static void Sta_ShowDistrAccessesPerDaysAndHour (unsigned long NumRows,MYSQL_RES
 
    /***** Put a selector for the type of color *****/
    fprintf (Gbl.F.Out,"<tr>"
-	              "<td colspan=\"26\" class=\"%s CENTER_MIDDLE\">",
-            The_ClassForm[Gbl.Prefs.Theme]);
+	              "<td colspan=\"26\" class=\"CENTER_MIDDLE\">");
 
    Act_FormStartAnchor (Gbl.Action.Act,"stat_form");
    Sta_WriteParamsDatesSeeAccesses ();
@@ -2077,9 +2076,11 @@ static void Sta_ShowDistrAccessesPerDaysAndHour (unsigned long NumRows,MYSQL_RES
       Sta_PutHiddenParamScopeSta ();
      }
 
-   fprintf (Gbl.F.Out,"%s: ",Txt_Color_of_the_graphic);
-   fprintf (Gbl.F.Out,"<select name=\"ColorType\""
+   fprintf (Gbl.F.Out,"<label class=\"%s\">%s:&nbsp;"
+                      "<select name=\"ColorType\""
                       " onchange=\"document.getElementById('%s').submit();\">",
+            The_ClassForm[Gbl.Prefs.Theme],
+            Txt_Color_of_the_graphic,
             Gbl.Form.Id);
    for (ColorType = (Sta_ColorType_t) 0;
 	ColorType < Sta_NUM_COLOR_TYPES;
@@ -2090,7 +2091,8 @@ static void Sta_ShowDistrAccessesPerDaysAndHour (unsigned long NumRows,MYSQL_RES
          fprintf (Gbl.F.Out," selected=\"selected\"");
       fprintf (Gbl.F.Out,">%s",Txt_STAT_COLOR_TYPES[ColorType]);
      }
-   fprintf (Gbl.F.Out,"</select>");
+   fprintf (Gbl.F.Out,"</select>"
+	              "</label>");
    Act_FormEnd ();
    fprintf (Gbl.F.Out,"</td>"
 	              "</tr>");
@@ -3812,8 +3814,7 @@ void Sta_ReqShowFigures (void)
    Lay_StartRoundFrame (NULL,Txt_Statistic,NULL,Hlp_STATS_Figures);
 
    /***** Compute stats for anywhere, degree or course? *****/
-   fprintf (Gbl.F.Out,"<div class=\"%s CENTER_MIDDLE\">"
-	              "%s: ",
+   fprintf (Gbl.F.Out,"<label class=\"%s\">%s:&nbsp;",
             The_ClassForm[Gbl.Prefs.Theme],Txt_Scope);
    Gbl.Scope.Allowed = 1 << Sco_SCOPE_SYS |
 	               1 << Sco_SCOPE_CTY |
@@ -3824,11 +3825,12 @@ void Sta_ReqShowFigures (void)
    Gbl.Scope.Default = Sco_SCOPE_SYS;
    Sco_GetScope ("ScopeSta");
    Sco_PutSelectorScope ("ScopeSta",false);
+   fprintf (Gbl.F.Out,"</label><br />");
 
    /***** Type of statistic *****/
-   fprintf (Gbl.F.Out,"<br />"
-	              "%s: <select name=\"FigureType\">",
-	    Txt_Statistic);
+   fprintf (Gbl.F.Out,"<label class=\"%s\">%s:&nbsp;"
+	              "<select name=\"FigureType\">",
+	    The_ClassForm[Gbl.Prefs.Theme],Txt_Statistic);
    for (FigureType = (Sta_FigureType_t) 0;
 	FigureType < Sta_NUM_FIGURES;
 	FigureType++)
@@ -3843,7 +3845,7 @@ void Sta_ReqShowFigures (void)
                Txt_STAT_USE_STAT_TYPES[FigureType]);
      }
    fprintf (Gbl.F.Out,"</select>"
-                      "</div>");
+	              "</label>");
 
    /***** Send button and end frame *****/
    Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,Txt_Show_statistic);
diff --git a/swad_timetable.c b/swad_timetable.c
index 544681b4a..fcdb71eb8 100644
--- a/swad_timetable.c
+++ b/swad_timetable.c
@@ -1181,7 +1181,7 @@ static void TT_TimeTableDrawCell (unsigned Day,unsigned Hour,unsigned Column,uns
             RowSpan,ColSpan,TimeTableClasses[ClassType]);
    if (ClassType == TT_NO_CLASS)
       fprintf (Gbl.F.Out,"%u",Hour % 4);
-   fprintf (Gbl.F.Out," CENTER_MIDDLE\">");
+   fprintf (Gbl.F.Out," CENTER_MIDDLE DAT_SMALL\">");
 
    /***** Form to modify this cell *****/
    if (TimeTableView == TT_CRS_EDIT)
@@ -1241,8 +1241,6 @@ static void TT_TimeTableDrawCell (unsigned Day,unsigned Hour,unsigned Column,uns
          Par_PutHiddenParamUnsigned ("ModTTHour",Hour);
          Par_PutHiddenParamUnsigned ("ModTTCol",Column);
 
-	 fprintf (Gbl.F.Out,"<span class=\"DAT_SMALL\">");
-
 	 /***** Class type *****/
 	 fprintf (Gbl.F.Out,"<select name=\"ModTTCellType\" style=\"width:68px;\""
 	                    " onchange=\"document.getElementById('%s').submit();\">",
@@ -1356,7 +1354,7 @@ static void TT_TimeTableDrawCell (unsigned Day,unsigned Hour,unsigned Column,uns
                Par_PutHiddenParamString ("ModHorGrp","");
 	       /***** Place *****/
 	       fprintf (Gbl.F.Out,"<br />"
-		                  "<label>"
+		                  "<label class=\"DAT_SMALL\">"
 		                  "%s"
                                   "<input type=\"text\" name=\"ModHorLugar\""
                                   " size=\"12\" maxlength=\"%u\" value=\"%s\""
@@ -1365,7 +1363,6 @@ static void TT_TimeTableDrawCell (unsigned Day,unsigned Hour,unsigned Column,uns
 		        Txt_Place,TT_MAX_LENGTH_PLACE,Place,Gbl.Form.Id);
 	      }
 	   }
-         fprintf (Gbl.F.Out,"</span>");
 	 break;
      }
 
diff --git a/swad_user.c b/swad_user.c
index 662cc9d90..0ef0f2964 100644
--- a/swad_user.c
+++ b/swad_user.c
@@ -2091,7 +2091,7 @@ void Usr_WriteLoggedUsrHead (void)
    char PhotoURL[PATH_MAX+1];
    char UsrName[Usr_MAX_BYTES_NAME+1];
 
-   /***** User's type *****/
+   /***** User's role *****/
    if (Rol_GetNumAvailableRoles () == 1)
      {
       Act_FormStart (ActFrmRolSes);
@@ -2882,18 +2882,16 @@ void Usr_ShowFormsLogoutAndRole (void)
 
    /***** Put a form to change my role *****/
    if (Rol_GetNumAvailableRoles () == 1)
-      fprintf (Gbl.F.Out,"<div class=\"DAT CENTER_MIDDLE\">"
-	                 "%s: <span class=\"DAT_N_BOLD\">%s</span>"
-                         "</div>",
+      fprintf (Gbl.F.Out,"<span class=\"DAT\">%s:&nbsp;</span>"
+	                 "<span class=\"DAT_N_BOLD\">%s</span>",
                Txt_Role,
                Txt_ROLES_SINGUL_Abc[Gbl.Usrs.Me.LoggedRole][Gbl.Usrs.Me.UsrDat.Sex]);
    else
      {
-      fprintf (Gbl.F.Out,"<div class=\"%s CENTER_MIDDLE\">"
-	                 "%s: ",
+      fprintf (Gbl.F.Out,"<label class=\"%s\">%s:&nbsp;",
                The_ClassForm[Gbl.Prefs.Theme],Txt_Role);
       Rol_PutFormToChangeMyRole ();
-      fprintf (Gbl.F.Out,"</div>");
+      fprintf (Gbl.F.Out,"</label>");
      }
 
    /***** End frame *****/