From a897bd234c9c879e4612f6fee0f7e5068b661466 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= <acanas@ugr.es>
Date: Sat, 2 Nov 2019 12:59:31 +0100
Subject: [PATCH] Version19.51

---
 swad_HTML.c         | 55 ++++++++++++++++++++++++++
 swad_HTML.h         |  3 ++
 swad_ID.c           |  7 ++--
 swad_account.c      | 10 +++--
 swad_agenda.c       |  9 +++--
 swad_announcement.c |  3 +-
 swad_assignment.c   | 14 ++++---
 swad_attendance.c   | 22 ++++++-----
 swad_centre.c       | 16 +++++---
 swad_changelog.h    |  4 +-
 swad_cookie.c       |  4 +-
 swad_course.c       | 17 +++++---
 swad_date.c         | 11 ++++--
 swad_degree.c       | 12 ++++--
 swad_enrolment.c    | 44 +++++++++++----------
 swad_exam.c         | 30 ++++++++++-----
 swad_figure.c       |  7 ++--
 swad_file_browser.c | 29 +++++++-------
 swad_forum.c        | 10 +++--
 swad_game.c         |  6 ++-
 swad_group.c        | 11 +++---
 swad_hierarchy.c    | 15 +++++---
 swad_indicator.c    | 12 ++++--
 swad_info.c         | 11 +++---
 swad_institution.c  | 12 ++++--
 swad_layout.c       |  2 +-
 swad_logo.c         |  4 +-
 swad_mail.c         | 11 +++---
 swad_mark.c         |  8 ++--
 swad_match.c        |  7 ++--
 swad_message.c      | 31 +++++++--------
 swad_network.c      |  4 +-
 swad_nickname.c     | 12 +++---
 swad_password.c     | 30 ++++++++-------
 swad_photo.c        | 13 ++++---
 swad_privacy.c      |  4 +-
 swad_profile.c      |  4 +-
 swad_project.c      | 16 +++++---
 swad_record.c       | 69 ++++++++++++++++++---------------
 swad_role.c         |  8 ++--
 swad_search.c       |  6 +--
 swad_statistic.c    | 33 +++++++++-------
 swad_survey.c       | 32 ++++++++-------
 swad_syllabus.c     |  4 +-
 swad_test.c         | 94 ++++++++++++++++++++++++---------------------
 swad_test_import.c  |  4 +-
 swad_timetable.c    | 30 +++++++--------
 swad_user.c         | 29 +++++++-------
 48 files changed, 495 insertions(+), 334 deletions(-)

diff --git a/swad_HTML.c b/swad_HTML.c
index 5f84df2f..6f6b9877 100644
--- a/swad_HTML.c
+++ b/swad_HTML.c
@@ -64,6 +64,7 @@ static unsigned HTM_UL_NestingLevel = 0;
 static unsigned HTM_LI_NestingLevel = 0;
 static unsigned HTM_A_NestingLevel = 0;
 static unsigned HTM_SCRIPT_NestingLevel = 0;
+static unsigned HTM_LABEL_NestingLevel = 0;
 static unsigned HTM_TEXTAREA_NestingLevel = 0;
 
 /*****************************************************************************/
@@ -86,6 +87,8 @@ static void HTM_LI_BeginWithoutAttr (void);
 
 static void HTM_A_BeginWithoutAttr (void);
 
+static void HTM_LABEL_BeginWithoutAttr (void);
+
 static void HTM_TEXTAREA_BeginWithoutAttr (void);
 
 /*****************************************************************************/
@@ -736,6 +739,58 @@ void HTM_SCRIPT_End (void)
    HTM_SCRIPT_NestingLevel--;
   }
 
+/*****************************************************************************/
+/*********************************** Labels **********************************/
+/*****************************************************************************/
+
+void HTM_LABEL_Begin (const char *fmt,...)
+  {
+   va_list ap;
+   int NumBytesPrinted;
+   char *Attr;
+
+   if (fmt)
+     {
+      if (fmt[0])
+	{
+	 va_start (ap,fmt);
+	 NumBytesPrinted = vasprintf (&Attr,fmt,ap);
+	 va_end (ap);
+
+	 if (NumBytesPrinted < 0)	// If memory allocation wasn't possible,
+					// or some other error occurs,
+					// vasprintf will return -1
+	    Lay_NotEnoughMemoryExit ();
+
+	 /***** Print HTML *****/
+	 fprintf (Gbl.F.Out,"<label %s>",Attr);
+
+	 free ((void *) Attr);
+	}
+      else
+         HTM_LABEL_BeginWithoutAttr ();
+     }
+   else
+      HTM_LABEL_BeginWithoutAttr ();
+
+   HTM_LABEL_NestingLevel++;
+  }
+
+static void HTM_LABEL_BeginWithoutAttr (void)
+  {
+   fprintf (Gbl.F.Out,"<label>");
+  }
+
+void HTM_LABEL_End (void)
+  {
+   if (HTM_LABEL_NestingLevel == 0)	// No LABEL open
+      Ale_ShowAlert (Ale_ERROR,"Trying to close unopened LABEL.");
+
+   fprintf (Gbl.F.Out,"</label>");
+
+   HTM_LABEL_NestingLevel--;
+  }
+
 /*****************************************************************************/
 /********************************* Text areas ********************************/
 /*****************************************************************************/
diff --git a/swad_HTML.h b/swad_HTML.h
index 211f576d..59b76cf4 100644
--- a/swad_HTML.h
+++ b/swad_HTML.h
@@ -86,6 +86,9 @@ void HTM_A_End (void);
 void HTM_SCRIPT_Begin (const char *URL,const char *CharSet);
 void HTM_SCRIPT_End (void);
 
+void HTM_LABEL_Begin (const char *fmt,...);
+void HTM_LABEL_End (void);
+
 void HTM_TEXTAREA_Begin (const char *fmt,...);
 void HTM_TEXTAREA_End (void);
 
diff --git a/swad_ID.c b/swad_ID.c
index affaad00..9f75475c 100644
--- a/swad_ID.c
+++ b/swad_ID.c
@@ -607,9 +607,9 @@ static void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat,
 
 	 HTM_TD_Begin ("class=\"REC_C1_BOT RT\"");
 	 fprintf (Gbl.F.Out,"<label for=\"UsrID\" class=\"%s\">"
-			    "%s:"
-			    "</label>",
+			    "%s:",
 		  The_ClassFormInBox[Gbl.Prefs.Theme],Txt_ID);
+	 HTM_LABEL_End ();
 	 HTM_TD_End ();
 
 	 HTM_TD_Begin ("class=\"REC_C2_BOT LT USR_ID\"");
@@ -687,10 +687,11 @@ static void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat,
       HTM_TR_Begin (NULL);
 
       HTM_TD_Begin ("class=\"REC_C1_BOT RT\"");
-      fprintf (Gbl.F.Out,"<label for=\"NewID\" class=\"%s\">%s:</label>",
+      fprintf (Gbl.F.Out,"<label for=\"NewID\" class=\"%s\">%s:",
 	       The_ClassFormInBox[Gbl.Prefs.Theme],
 	       UsrDat->IDs.Num ? Txt_Another_ID :	// A new user's ID
 		                 Txt_ID);		// The first user's ID
+      HTM_LABEL_End ();
       HTM_TD_End ();
 
       HTM_TD_Begin ("class=\"REC_C2_BOT LT DAT\"");
diff --git a/swad_account.c b/swad_account.c
index 68f80135..59352400 100644
--- a/swad_account.c
+++ b/swad_account.c
@@ -153,10 +153,10 @@ static void Acc_ShowFormCheckIfIHaveAccount (const char *Title)
 		      "%s:&nbsp;"
 		      "<input type=\"text\" name=\"ID\""
 		      " size=\"18\" maxlength=\"%u\" value=\"\""
-		      " required=\"required\" />"
-		      "</label>",
+		      " required=\"required\" />",
 	    The_ClassFormInBox[Gbl.Prefs.Theme],Txt_ID,
 	    ID_MAX_CHARS_USR_ID);
+   HTM_LABEL_End ();
    Btn_PutCreateButtonInline (Txt_Check);
    Frm_EndForm ();
 
@@ -368,9 +368,10 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"NewNick\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"NewNick\" class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],
             Txt_Nickname);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LM\"");
@@ -389,9 +390,10 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"NewEmail\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"NewEmail\" class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],
             Txt_Email);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LM\"");
diff --git a/swad_agenda.c b/swad_agenda.c
index 368c6f59..ae3ca446 100644
--- a/swad_agenda.c
+++ b/swad_agenda.c
@@ -1500,9 +1500,10 @@ void Agd_RequestCreatOrEditEvent (void)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"Event\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"Event\" class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],
             Txt_Event);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LM\"");
@@ -1518,9 +1519,10 @@ void Agd_RequestCreatOrEditEvent (void)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"Location\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"Location\" class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],
             Txt_Location);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LM\"");
@@ -1540,9 +1542,10 @@ void Agd_RequestCreatOrEditEvent (void)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RT\"");
-   fprintf (Gbl.F.Out,"<label for=\"Txt\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"Txt\" class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],
             Txt_Description);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LT\"");
diff --git a/swad_announcement.c b/swad_announcement.c
index 0f402623..245a2129 100644
--- a/swad_announcement.c
+++ b/swad_announcement.c
@@ -454,8 +454,9 @@ static void Ann_PutSubjectMessage (const char *Field,const char *Label,
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RT\"");
-   fprintf (Gbl.F.Out,"<label for=\"%s\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"%s\" class=\"%s\">%s:",
 	    Field,The_ClassFormInBox[Gbl.Prefs.Theme],Label);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LT\"");
diff --git a/swad_assignment.c b/swad_assignment.c
index 78c0ba26..b2aae4fb 100644
--- a/swad_assignment.c
+++ b/swad_assignment.c
@@ -1167,8 +1167,9 @@ void Asg_RequestCreatOrEditAsg (void)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"Title\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"Title\" class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Title);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LM\"");
@@ -1193,10 +1194,10 @@ void Asg_RequestCreatOrEditAsg (void)
    HTM_TD_Begin ("class=\"LM\"");
    fprintf (Gbl.F.Out,"<label class=\"DAT\">%s:"
                       "<input type=\"text\" name=\"Folder\""
-                      " size=\"30\" maxlength=\"%u\" value=\"%s\" />"
-                      "</label>",
+                      " size=\"30\" maxlength=\"%u\" value=\"%s\" />",
             Txt_Folder,
             Brw_MAX_CHARS_FOLDER,Asg.Folder);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TR_End ();
@@ -1205,8 +1206,9 @@ void Asg_RequestCreatOrEditAsg (void)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RT\"");
-   fprintf (Gbl.F.Out,"<label for=\"Txt\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"Txt\" class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Description);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LT\"");
@@ -1271,9 +1273,9 @@ static void Asg_ShowLstGrpsToEditAssignment (long AsgCod)
       if (!Asg_CheckIfAsgIsAssociatedToGrps (AsgCod))
          fprintf (Gbl.F.Out," checked=\"checked\"");
       fprintf (Gbl.F.Out," onclick=\"uncheckChildren(this,'GrpCods')\" />"
-	                 "%s %s"
-                         "</label>",
+	                 "%s %s",
                Txt_The_whole_course,Gbl.Hierarchy.Crs.ShrtName);
+      HTM_LABEL_End ();
       HTM_TD_End ();
 
       HTM_TR_End ();
diff --git a/swad_attendance.c b/swad_attendance.c
index a6119893..2b6e3859 100644
--- a/swad_attendance.c
+++ b/swad_attendance.c
@@ -1104,8 +1104,9 @@ void Att_RequestCreatOrEditAttEvent (void)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RT\"");
-   fprintf (Gbl.F.Out,"<label for=\"Title\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"Title\" class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Title);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LT\"");
@@ -1124,8 +1125,9 @@ void Att_RequestCreatOrEditAttEvent (void)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RT\"");
-   fprintf (Gbl.F.Out,"<label for=\"ComTchVisible\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"ComTchVisible\" class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Teachers_comment);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LT\"");
@@ -1151,8 +1153,9 @@ void Att_RequestCreatOrEditAttEvent (void)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RT\"");
-   fprintf (Gbl.F.Out,"<label for=\"Txt\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"Txt\" class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Description);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LT\"");
@@ -1217,9 +1220,9 @@ static void Att_ShowLstGrpsToEditAttEvent (long AttCod)
       if (!Att_CheckIfAttEventIsAssociatedToGrps (AttCod))
          fprintf (Gbl.F.Out," checked=\"checked\"");
       fprintf (Gbl.F.Out," onclick=\"uncheckChildren(this,'GrpCods')\" />"
-	                 "%s %s"
-                         "</label>",
+	                 "%s %s",
                Txt_The_whole_course,Gbl.Hierarchy.Crs.ShrtName);
+      HTM_LABEL_End ();
       HTM_TD_End ();
 
       HTM_TR_End ();
@@ -2083,7 +2086,7 @@ static void Att_WriteRowUsrToCallTheRoll (unsigned NumUsr,
    HTM_TD_Begin ("class=\"BT%u\"",Gbl.RowEvenOdd);
    fprintf (Gbl.F.Out,"<label for=\"Std%u\">",NumUsr);
    Att_PutCheckOrCross (Present);
-   fprintf (Gbl.F.Out,"</label>");
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    /***** Checkbox to select user *****/
@@ -3131,17 +3134,18 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView)
       HTM_TD_End ();
 
       HTM_TD_Begin ("class=\"DAT RT COLOR%u\"",Gbl.RowEvenOdd);
-      fprintf (Gbl.F.Out,"<label for=\"Att%u\">%u:</label>",
+      fprintf (Gbl.F.Out,"<label for=\"Att%u\">%u:",
 	       NumAttEvent,NumAttEvent + 1);
+      HTM_LABEL_End ();
       HTM_TD_End ();
 
       if (asprintf (&Id,"att_date_start_%u",UniqueId) < 0)
 	 Lay_NotEnoughMemoryExit ();
       HTM_TD_Begin ("class=\"DAT LT COLOR%u\"",Gbl.RowEvenOdd);
       fprintf (Gbl.F.Out,"<label for=\"Att%u\">"
-                         "<span id=\"%s\"></span>"
-                         "</label>",
+                         "<span id=\"%s\"></span>",
 	       NumAttEvent,Id);
+      HTM_LABEL_End ();
       Dat_WriteLocalDateHMSFromUTC (Id,Gbl.AttEvents.Lst[NumAttEvent].TimeUTC[Att_START_TIME],
 				    Gbl.Prefs.DateFormat,Dat_SEPARATOR_COMMA,
 				    true,true,true,0x7);
diff --git a/swad_centre.c b/swad_centre.c
index c173f200..b87f8667 100644
--- a/swad_centre.c
+++ b/swad_centre.c
@@ -413,9 +413,10 @@ static void Ctr_Configuration (bool PrintView)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"OthInsCod\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"OthInsCod\" class=\"%s\">%s:",
 	    The_ClassFormInBox[Gbl.Prefs.Theme],
 	    Txt_Institution);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"DAT_N LM\"");
@@ -456,9 +457,10 @@ static void Ctr_Configuration (bool PrintView)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"FullName\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"FullName\" class=\"%s\">%s:",
 	    The_ClassFormInBox[Gbl.Prefs.Theme],
 	    Txt_Centre);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"DAT_N LM\"");
@@ -488,9 +490,10 @@ static void Ctr_Configuration (bool PrintView)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"ShortName\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"ShortName\" class=\"%s\">%s:",
 	    The_ClassFormInBox[Gbl.Prefs.Theme],
 	    Txt_Short_name);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"DAT_N LM\"");
@@ -568,9 +571,10 @@ static void Ctr_Configuration (bool PrintView)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"WWW\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"WWW\" class=\"%s\">%s:",
 	    The_ClassFormInBox[Gbl.Prefs.Theme],
 	    Txt_Web);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LM\"");
@@ -2334,12 +2338,12 @@ void Ctr_RequestPhoto (void)
    fprintf (Gbl.F.Out,"<label class=\"%s\">"
 	              "%s:&nbsp;"
                       "<input type=\"file\" name=\"%s\" accept=\"image/*\""
-                      " onchange=\"document.getElementById('%s').submit();\" />"
-	              "</label>",
+                      " onchange=\"document.getElementById('%s').submit();\" />",
             The_ClassFormInBox[Gbl.Prefs.Theme],
             Txt_File_with_the_photo,
             Fil_NAME_OF_PARAM_FILENAME_ORG,
             Gbl.Form.Id);
+   HTM_LABEL_End ();
 
    /***** End box *****/
    Box_BoxEnd ();
diff --git a/swad_changelog.h b/swad_changelog.h
index 812568c5..6dad0760 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -487,14 +487,16 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
 En OpenSWAD:
 ps2pdf source.ps destination.pdf
 */
-#define Log_PLATFORM_VERSION	"SWAD 19.50.4 (2019-11-02)"
+#define Log_PLATFORM_VERSION	"SWAD 19.51 (2019-11-02)"
 #define CSS_FILE		"swad19.47.css"
 #define JS_FILE			"swad19.39.js"
 /*
 // TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.)
 // TODO: Impedir la creación y edición de proyectos si no son editables.
 // TODO: Importante: filtrar proyectos por usuarios (igual que en trabajos o en asistencia)
+// TODO: Buscar <label... y sustituir por HTM_LABEL_Begin ()
 
+	Version 19.51:    Nov 02, 2019	Code refactoring in HTML labels. Not finished. (246220 lines)
 	Version 19.50.4:  Nov 02, 2019	Code refactoring related with writing of local date-time. (246072 lines)
 	Version 19.50.3:  Nov 02, 2019	Code refactoring related with writing of local date-time. (246059 lines)
 	Version 19.50.2:  Nov 01, 2019	Code refactoring related with writing of local date-time. (246079 lines)
diff --git a/swad_cookie.c b/swad_cookie.c
index 0c98aca1..ef5e8c3d 100644
--- a/swad_cookie.c
+++ b/swad_cookie.c
@@ -86,10 +86,10 @@ void Coo_EditMyPrefsOnCookies (void)
    if (Gbl.Usrs.Me.UsrDat.Prefs.AcceptThirdPartyCookies)
       fprintf (Gbl.F.Out," checked=\"checked\"");
    fprintf (Gbl.F.Out," onclick=\"document.getElementById('%s').submit();\" />"
-	              "%s"
-		      "</label>",
+	              "%s",
 	    Gbl.Form.Id,
 	    Txt_Accept_third_party_cookies_to_view_multimedia_content_from_other_websites);
+   HTM_LABEL_End ();
 
    /* End container */
    HTM_DIV_End ();
diff --git a/swad_course.c b/swad_course.c
index f3448d89..6138806e 100644
--- a/swad_course.c
+++ b/swad_course.c
@@ -237,9 +237,10 @@ static void Crs_Configuration (bool PrintView)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"OthDegCod\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"OthDegCod\" class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],
             Txt_Degree);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"DAT LM\"");
@@ -282,9 +283,10 @@ static void Crs_Configuration (bool PrintView)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"FullName\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"FullName\" class=\"%s\">%s:",
 	    The_ClassFormInBox[Gbl.Prefs.Theme],
 	    Txt_Course);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"DAT_N LM\"");
@@ -314,9 +316,10 @@ static void Crs_Configuration (bool PrintView)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"ShortName\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"ShortName\" class=\"%s\">%s:",
 	    The_ClassFormInBox[Gbl.Prefs.Theme],
 	    Txt_Short_name);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"DAT_N LM\"");
@@ -347,9 +350,10 @@ static void Crs_Configuration (bool PrintView)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"OthCrsYear\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"OthCrsYear\" class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],
             Txt_Year_OF_A_DEGREE);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"DAT LM\"");
@@ -384,9 +388,10 @@ static void Crs_Configuration (bool PrintView)
       HTM_TR_Begin (NULL);
 
       HTM_TD_Begin ("class=\"RM\"");
-      fprintf (Gbl.F.Out,"<label for=\"InsCrsCod\" class=\"%s\">%s:</label>",
+      fprintf (Gbl.F.Out,"<label for=\"InsCrsCod\" class=\"%s\">%s:",
               The_ClassFormInBox[Gbl.Prefs.Theme],
               Txt_Institutional_code);
+      HTM_LABEL_End ();
       HTM_TD_End ();
 
       HTM_TD_Begin ("class=\"DAT LM\"");
@@ -3340,7 +3345,7 @@ void Crs_AskRemoveOldCrss (void)
    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,"</label>");
+   HTM_LABEL_End ();
 
    /***** Send button and end box *****/
    Box_EndBoxWithButton (Btn_REMOVE_BUTTON,Txt_Eliminate);
diff --git a/swad_date.c b/swad_date.c
index a48c18e5..0aa03d9b 100644
--- a/swad_date.c
+++ b/swad_date.c
@@ -129,7 +129,7 @@ void Dat_PutBoxToSelectDateFormat (void)
 	       Gbl.Form.Id);
       Dat_PutSpanDateFormat (Format);
       Dat_PutScriptDateFormat (Format);
-      fprintf (Gbl.F.Out,"</label>");
+      HTM_LABEL_End ();
       HTM_LI_End ();
      }
 
@@ -434,9 +434,10 @@ void Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (bool SetHMS00000
 
    /***** Start date-time *****/
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],
             Txt_START_END_TIME[Dat_START_TIME]);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    /* Date-time */
@@ -467,9 +468,10 @@ void Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (bool SetHMS00000
 
    /***** End date-time *****/
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],
             Txt_START_END_TIME[Dat_END_TIME]);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    /* Date-time */
@@ -512,9 +514,10 @@ void Dat_PutFormStartEndClientLocalDateTimes (time_t TimeUTC[2],
       HTM_TR_Begin (NULL);
 
       HTM_TD_Begin ("class=\"RM\"");
-      fprintf (Gbl.F.Out,"<label class=\"%s\">%s:</label>",
+      fprintf (Gbl.F.Out,"<label class=\"%s\">%s:",
                The_ClassFormInBox[Gbl.Prefs.Theme],
                Txt_START_END_TIME[StartEndTime]);
+      HTM_LABEL_End ();
       HTM_TD_End ();
 
       HTM_TD_Begin ("class=\"LM\"");
diff --git a/swad_degree.c b/swad_degree.c
index fab5e55c..6fd335ae 100644
--- a/swad_degree.c
+++ b/swad_degree.c
@@ -342,9 +342,10 @@ static void Deg_Configuration (bool PrintView)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"OthCtrCod\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"OthCtrCod\" class=\"%s\">%s:",
 	    The_ClassFormInBox[Gbl.Prefs.Theme],
 	    Txt_Centre);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"DAT_N LM\"");
@@ -384,9 +385,10 @@ static void Deg_Configuration (bool PrintView)
    /***** Degree full name *****/
    HTM_TR_Begin (NULL);
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"FullName\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"FullName\" class=\"%s\">%s:",
 	    The_ClassFormInBox[Gbl.Prefs.Theme],
 	    Txt_Degree);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"DAT_N LM\"");
@@ -416,9 +418,10 @@ static void Deg_Configuration (bool PrintView)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"ShortName\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"ShortName\" class=\"%s\">%s:",
 	    The_ClassFormInBox[Gbl.Prefs.Theme],
 	    Txt_Short_name);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"DAT_N LM\"");
@@ -448,9 +451,10 @@ static void Deg_Configuration (bool PrintView)
    /***** Degree WWW *****/
    HTM_TR_Begin (NULL);
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"WWW\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"WWW\" class=\"%s\">%s:",
 	    The_ClassFormInBox[Gbl.Prefs.Theme],
 	    Txt_Web);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"DAT LM\"");
diff --git a/swad_enrolment.c b/swad_enrolment.c
index c5ed7198..c94c3f4b 100644
--- a/swad_enrolment.c
+++ b/swad_enrolment.c
@@ -379,13 +379,13 @@ void Enr_WriteFormToReqAnotherUsrID (Act_Action_t NextAction,void (*FuncParams)
       FuncParams ();
    fprintf (Gbl.F.Out,"<label for=\"OtherUsrIDNickOrEMail\""
 	              " class=\"%s RM\">"
-                      "%s:&nbsp;"
-                      "</label>"
-                      "<input type=\"text\" id=\"OtherUsrIDNickOrEMail\""
+                      "%s:&nbsp;",
+            The_ClassFormInBox[Gbl.Prefs.Theme],
+            Txt_nick_email_or_ID);
+   HTM_LABEL_End ();
+   fprintf (Gbl.F.Out,"<input type=\"text\" id=\"OtherUsrIDNickOrEMail\""
                       " name=\"OtherUsrIDNickOrEMail\""
                       " size=\"18\" maxlength=\"%u\" required=\"required\" />",
-            The_ClassFormInBox[Gbl.Prefs.Theme],
-            Txt_nick_email_or_ID,
             Cns_MAX_CHARS_EMAIL_ADDRESS);
 
    /***** Send button*****/
@@ -822,7 +822,7 @@ void Enr_AskRemoveOldUsrs (void)
    fprintf (Gbl.F.Out,"</select>&nbsp;");
    fprintf (Gbl.F.Out,Txt_Eliminate_all_users_who_are_not_enroled_on_any_courses_PART_2_OF_2,
             Cfg_PLATFORM_SHORT_NAME);
-   fprintf (Gbl.F.Out,"</label>");
+   HTM_LABEL_End ();
 
    /***** Send button and end box *****/
    Box_EndBoxWithButton (Btn_REMOVE_BUTTON,Txt_Eliminate);
@@ -923,9 +923,10 @@ static void Enr_PutAreaToEnterUsrsIDs (void)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RT\"");
-   fprintf (Gbl.F.Out,"<label for=\"UsrsIDs\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"UsrsIDs\" class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],
             Txt_List_of_nicks_emails_or_IDs);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LT\"");
@@ -960,48 +961,48 @@ static void Enr_PutActionsRegRemSeveralUsrs (void)
       fprintf (Gbl.F.Out,"<input type=\"radio\" id=\"RegRemAction%u\""
 			 " name=\"RegRemAction\" value=\"%u\" checked=\"checked\" />"
 			 "<label for=\"RegRemAction%u\">"
-			 "%s"
-			 "</label>",
+			 "%s",
       	       (unsigned) Enr_REGISTER_SPECIFIED_USRS_IN_CRS,
 	       (unsigned) Enr_REGISTER_SPECIFIED_USRS_IN_CRS,
 	       (unsigned) Enr_REGISTER_SPECIFIED_USRS_IN_CRS,
 	       Txt_Register_the_users_indicated_in_step_1);
+      HTM_LABEL_End ();
       HTM_LI_End ();
 
       HTM_LI_Begin (NULL);
       fprintf (Gbl.F.Out,"<input type=\"radio\" id=\"RegRemAction%u\""
 			 " name=\"RegRemAction\" value=\"%u\" />"
 			 "<label for=\"RegRemAction%u\">"
-			 "%s"
-			 "</label>",
+			 "%s",
 	       (unsigned) Enr_REMOVE_SPECIFIED_USRS_FROM_CRS,
 	       (unsigned) Enr_REMOVE_SPECIFIED_USRS_FROM_CRS,
 	       (unsigned) Enr_REMOVE_SPECIFIED_USRS_FROM_CRS,
 	       Txt_Remove_the_users_indicated_in_step_1);
+      HTM_LABEL_End ();
       HTM_LI_End ();
 
       HTM_LI_Begin (NULL);
       fprintf (Gbl.F.Out,"<input type=\"radio\" id=\"RegRemAction%u\""
 			 " name=\"RegRemAction\" value=\"%u\" />"
 			 "<label for=\"RegRemAction%u\">"
-			 "%s"
-			 "</label>",
+			 "%s",
 	       (unsigned) Enr_REMOVE_NOT_SPECIFIED_USRS_FROM_CRS,
 	       (unsigned) Enr_REMOVE_NOT_SPECIFIED_USRS_FROM_CRS,
 	       (unsigned) Enr_REMOVE_NOT_SPECIFIED_USRS_FROM_CRS,
 	       Txt_Remove_the_users_not_indicated_in_step_1);
+      HTM_LABEL_End ();
       HTM_LI_End ();
 
       HTM_LI_Begin (NULL);
       fprintf (Gbl.F.Out,"<input id=\"RegRemAction%u\" type=\"radio\""
 			 " name=\"RegRemAction\" value=\"%u\" />"
 			 "<label for=\"RegRemAction%u\">"
-			 "%s"
-			 "</label>",
+			 "%s",
 	       (unsigned) Enr_UPDATE_USRS_IN_CRS,
 	       (unsigned) Enr_UPDATE_USRS_IN_CRS,
 	       (unsigned) Enr_UPDATE_USRS_IN_CRS,
 	       Txt_Register_the_users_indicated_in_step_1_and_remove_the_users_not_indicated);
+      HTM_LABEL_End ();
       HTM_LI_End ();
      }
 
@@ -1012,13 +1013,12 @@ static void Enr_PutActionsRegRemSeveralUsrs (void)
       fprintf (Gbl.F.Out,"<input type=\"radio\" id=\"RegRemAction%u\""
                          " name=\"RegRemAction\" value=\"%u\" />"
 			 "<label for=\"RegRemAction%u\">"
-                         "%s"
-			 "</label>"
-                         "</li>",
+                         "%s",
                (unsigned) Enr_ELIMINATE_USRS_FROM_PLATFORM,
                (unsigned) Enr_ELIMINATE_USRS_FROM_PLATFORM,
                (unsigned) Enr_ELIMINATE_USRS_FROM_PLATFORM,
                Txt_Eliminate_from_the_platform_the_users_indicated_in_step_1);
+      HTM_LABEL_End ();
       HTM_LI_End ();
      }
 
@@ -1782,7 +1782,7 @@ static void Enr_StartRegRemOneUsrAction (Enr_RegRemOneUsrAction_t RegRemOneUsrAc
 
 static void Enr_EndRegRemOneUsrAction (void)
   {
-   fprintf (Gbl.F.Out,"</label>");
+   HTM_LABEL_End ();
    HTM_LI_End ();
   }
 
@@ -2297,8 +2297,9 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"ScopeEnr\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"ScopeEnr\" class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Scope);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LM\"");
@@ -2311,8 +2312,9 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RT\"");
-   fprintf (Gbl.F.Out,"<label class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Users);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"DAT LM\"");
diff --git a/swad_exam.c b/swad_exam.c
index 2cd8635e..b802f4e3 100644
--- a/swad_exam.c
+++ b/swad_exam.c
@@ -1092,8 +1092,9 @@ static void Exa_ShowExamAnnouncement (long ExaCod,
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RB\"");
-   fprintf (Gbl.F.Out,"<label for=\"CrsName\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"CrsName\" class=\"%s\">%s:",
             StyleForm,Txt_EXAM_ANNOUNCEMENT_Course);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"%s LB\"",StyleNormal);
@@ -1114,8 +1115,9 @@ static void Exa_ShowExamAnnouncement (long ExaCod,
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RB\"");
-   fprintf (Gbl.F.Out,"<label for=\"Year\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"Year\" class=\"%s\">%s:",
             StyleForm,Txt_EXAM_ANNOUNCEMENT_Year_or_semester);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"%s LB\"",StyleNormal);
@@ -1147,8 +1149,9 @@ static void Exa_ShowExamAnnouncement (long ExaCod,
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RB\"");
-   fprintf (Gbl.F.Out,"<label for=\"ExamSession\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"ExamSession\" class=\"%s\">%s:",
             StyleForm,Txt_EXAM_ANNOUNCEMENT_Session);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"%s LB\"",StyleNormal);
@@ -1306,8 +1309,9 @@ static void Exa_ShowExamAnnouncement (long ExaCod,
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RT\"");
-   fprintf (Gbl.F.Out,"<label for=\"Place\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"Place\" class=\"%s\">%s:",
             StyleForm,Txt_EXAM_ANNOUNCEMENT_Place_of_exam);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"%s LT\"",StyleNormal);
@@ -1333,8 +1337,9 @@ static void Exa_ShowExamAnnouncement (long ExaCod,
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RT\"");
-   fprintf (Gbl.F.Out,"<label for=\"ExamMode\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"ExamMode\" class=\"%s\">%s:",
             StyleForm,Txt_EXAM_ANNOUNCEMENT_Mode);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"%s LT\"",StyleNormal);
@@ -1359,8 +1364,9 @@ static void Exa_ShowExamAnnouncement (long ExaCod,
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RT\"");
-   fprintf (Gbl.F.Out,"<label for=\"Structure\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"Structure\" class=\"%s\">%s:",
             StyleForm,Txt_EXAM_ANNOUNCEMENT_Structure_of_the_exam);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"%s LT\"",StyleNormal);
@@ -1385,8 +1391,9 @@ static void Exa_ShowExamAnnouncement (long ExaCod,
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RT\"");
-   fprintf (Gbl.F.Out,"<label for=\"DocRequired\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"DocRequired\" class=\"%s\">%s:",
             StyleForm,Txt_EXAM_ANNOUNCEMENT_Documentation_required);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"%s LT\"",StyleNormal);
@@ -1411,8 +1418,9 @@ static void Exa_ShowExamAnnouncement (long ExaCod,
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RT\"");
-   fprintf (Gbl.F.Out,"<label for=\"MatRequired\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"MatRequired\" class=\"%s\">%s:",
             StyleForm,Txt_EXAM_ANNOUNCEMENT_Material_required);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"%s LT\"",StyleNormal);
@@ -1437,8 +1445,9 @@ static void Exa_ShowExamAnnouncement (long ExaCod,
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RT\"");
-   fprintf (Gbl.F.Out,"<label for=\"MatAllowed\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"MatAllowed\" class=\"%s\">%s:",
             StyleForm,Txt_EXAM_ANNOUNCEMENT_Material_allowed);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"%s LT\"",StyleNormal);
@@ -1463,8 +1472,9 @@ static void Exa_ShowExamAnnouncement (long ExaCod,
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RT\"");
-   fprintf (Gbl.F.Out,"<label for=\"OtherInfo\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"OtherInfo\" class=\"%s\">%s:",
             StyleForm,Txt_EXAM_ANNOUNCEMENT_Other_information);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"%s LT\"",StyleNormal);
diff --git a/swad_figure.c b/swad_figure.c
index 5cc037c9..56c27985 100644
--- a/swad_figure.c
+++ b/swad_figure.c
@@ -216,7 +216,8 @@ void Fig_ReqShowFigures (void)
    Gbl.Scope.Default = Hie_SYS;
    Sco_GetScope ("ScopeFig");
    Sco_PutSelectorScope ("ScopeFig",false);
-   fprintf (Gbl.F.Out,"</label><br />");
+   HTM_LABEL_End ();
+   fprintf (Gbl.F.Out,"<br />");
 
    /***** Type of statistic *****/
    fprintf (Gbl.F.Out,"<label class=\"%s\">%s:&nbsp;"
@@ -235,8 +236,8 @@ void Fig_ReqShowFigures (void)
 	                 "</option>",
                Txt_FIGURE_TYPES[FigureType]);
      }
-   fprintf (Gbl.F.Out,"</select>"
-	              "</label>");
+   fprintf (Gbl.F.Out,"</select>");
+   HTM_LABEL_End ();
 
    /***** Send button and end box *****/
    Box_EndBoxWithButton (Btn_CONFIRM_BUTTON,Txt_Show_statistic);
diff --git a/swad_file_browser.c b/swad_file_browser.c
index 228835b4..b22a4625 100644
--- a/swad_file_browser.c
+++ b/swad_file_browser.c
@@ -3270,10 +3270,10 @@ static void Brw_FormToChangeCrsGrpZone (void)
    if (IsCourseZone)
       fprintf (Gbl.F.Out," checked=\"checked\"");
    fprintf (Gbl.F.Out," onclick=\"document.getElementById('%s').submit();\" />"
-                      "%s"
-                      "</label>",
+                      "%s",
             Gbl.Form.Id,
             Gbl.Hierarchy.Crs.FullName);
+   HTM_LABEL_End ();
    HTM_LI_End ();
 
    /***** List my groups for unique selection *****/
@@ -3303,10 +3303,10 @@ static void Brw_FormToChangeCrsGrpZone (void)
 	 if (IsGroupZone && GrpDat.GrpCod == Gbl.Crs.Grps.GrpCod)
 	    fprintf (Gbl.F.Out," checked=\"checked\"");
 	 fprintf (Gbl.F.Out," onclick=\"document.getElementById('%s').submit();\" />"
-			    "%s %s"
-			    "</label>",
+			    "%s %s",
 		  Gbl.Form.Id,
                   GrpDat.GrpTypName,GrpDat.GrpName);
+	 HTM_LABEL_End ();
 	 HTM_LI_End ();
         }
 
@@ -8348,10 +8348,10 @@ static void Brw_PutFormToCreateAFolder (const char FileNameToShow[NAME_MAX + 1])
 	              "%s: "
                       "<input type=\"text\" name=\"NewFolderName\""
                       " size=\"30\" maxlength=\"%u\" value=\"\""
-                      " required=\"required\" />"
-	              "</label>",
+                      " required=\"required\" />",
             The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Folder,
             Brw_MAX_CHARS_FOLDER);
+   HTM_LABEL_End ();
 
    /***** Send button and end box *****/
    Box_EndBoxWithButton (Btn_CREATE_BUTTON,Txt_Create_folder);
@@ -8513,9 +8513,9 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow)
 
    HTM_TD_Begin ("class=\"RM\"");
    fprintf (Gbl.F.Out,"<label for=\"NewLinkURL\" class=\"%s\">"
-	              "%s:&nbsp;"
-	              "</label>",
+	              "%s:&nbsp;",
             The_ClassFormInBox[Gbl.Prefs.Theme],Txt_URL);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LM\"");
@@ -8533,9 +8533,9 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow)
 
    HTM_TD_Begin ("class=\"RM\"");
    fprintf (Gbl.F.Out,"<label for=\"NewLinkName\" class=\"%s\">"
-	              "%s&nbsp;(%s):&nbsp;"
-	              "</label>",
+	              "%s&nbsp;(%s):&nbsp;",
             The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Save_as,Txt_optional);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LM\"");
@@ -9587,9 +9587,9 @@ void Brw_ShowFileMetadata (void)
 
 	 HTM_TD_Begin ("class=\"RM\"");
 	 fprintf (Gbl.F.Out,"<label for=\"PublicFile\" class=\"%s\">"
-			    "%s:"
-			    "</label>",
+			    "%s:",
 		  The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Availability);
+	 HTM_LABEL_End ();
 	 HTM_TD_End ();
 
 	 HTM_TD_Begin ("class=\"DAT LM\"");
@@ -9621,8 +9621,9 @@ void Brw_ShowFileMetadata (void)
 	 HTM_TR_Begin (NULL);
 
 	 HTM_TD_Begin ("class=\"RM\"");
-	 fprintf (Gbl.F.Out,"<label for=\"License\" class=\"%s\">%s:</label>",
+	 fprintf (Gbl.F.Out,"<label for=\"License\" class=\"%s\">%s:",
 		  The_ClassFormInBox[Gbl.Prefs.Theme],Txt_License);
+	 HTM_LABEL_End ();
 	 HTM_TD_End ();
 
 	 HTM_TD_Begin ("class=\"DAT LM\"");
@@ -12166,7 +12167,7 @@ void Brw_AskRemoveOldFiles (void)
    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,"</label>");
+   HTM_LABEL_End ();
 
    /***** Send button and end box *****/
    Box_EndBoxWithButton (Btn_REMOVE_BUTTON,Txt_Remove);
diff --git a/swad_forum.c b/swad_forum.c
index f801dbc1..a9fb88ec 100644
--- a/swad_forum.c
+++ b/swad_forum.c
@@ -1761,9 +1761,9 @@ static void For_PutFormWhichForums (void)
       if (ForumSet == Gbl.Forum.ForumSet)
          fprintf (Gbl.F.Out," checked=\"checked\"");
       fprintf (Gbl.F.Out," onclick=\"document.getElementById('%s').submit();\" />"
-	                 "%s"
-                         "</label>",
+	                 "%s",
                Gbl.Form.Id,Txt_FORUM_WHICH_FORUM[ForumSet]);
+      HTM_LABEL_End ();
       HTM_LI_End ();
      }
    HTM_UL_End ();
@@ -3905,8 +3905,9 @@ static void For_WriteFormForumPst (bool IsReply,const char *Subject)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"Subject\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"Subject\" class=\"%s\">%s:",
 	    The_ClassFormInBox[Gbl.Prefs.Theme],Txt_MSG_Subject);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LM\"");
@@ -3925,8 +3926,9 @@ static void For_WriteFormForumPst (bool IsReply,const char *Subject)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RT\"");
-   fprintf (Gbl.F.Out,"<label for=\"Content\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"Content\" class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],Txt_MSG_Content);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LT\"");
diff --git a/swad_game.c b/swad_game.c
index d9a0e387..994bf9de 100644
--- a/swad_game.c
+++ b/swad_game.c
@@ -1139,9 +1139,10 @@ static void Gam_PutFormsEditionGame (struct Game *Game,bool ItsANewGame)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"Title\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"Title\" class=\"%s\">%s:",
 	    The_ClassFormInBox[Gbl.Prefs.Theme],
 	    Txt_Title);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LM\"");
@@ -1157,9 +1158,10 @@ static void Gam_PutFormsEditionGame (struct Game *Game,bool ItsANewGame)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RT\"");
-   fprintf (Gbl.F.Out,"<label for=\"Txt\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"Txt\" class=\"%s\">%s:",
 	    The_ClassFormInBox[Gbl.Prefs.Theme],
 	    Txt_Description);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LT\"");
diff --git a/swad_group.c b/swad_group.c
index 7760eee9..4cda7140 100644
--- a/swad_group.c
+++ b/swad_group.c
@@ -466,10 +466,10 @@ static void Grp_PutCheckboxAllGrps (Grp_WhichGroups_t GroupsSelectableByStdsOrNE
       fprintf (Gbl.F.Out," disabled=\"disabled\"");
    fprintf (Gbl.F.Out," />"
 		      "<label for=\"AllGroups\" class=\"%s\">"
-		      "&nbsp;%s"
-		      "</label>",
+		      "&nbsp;%s",
 	    The_ClassFormInBox[Gbl.Prefs.Theme],
 	    Txt_All_groups);
+   HTM_LABEL_End ();
    HTM_DIV_End ();
   }
 
@@ -2290,8 +2290,9 @@ static void Grp_ListGrpsForMultipleSelection (struct GroupType *GrpTyp,
 
    /* Group name = students with no group */
    HTM_TD_Begin ("class=\"DAT LM\"");
-   fprintf (Gbl.F.Out,"<label for=\"Grp%ld\">%s</label>",
+   fprintf (Gbl.F.Out,"<label for=\"Grp%ld\">%s",
             -(GrpTyp->GrpTypCod),Txt_users_with_no_group);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    /* Classroom */
@@ -2398,10 +2399,10 @@ static void Grp_WriteRowGrp (struct Group *Grp,bool Highlight)
    else
       HTM_TD_Begin ("class=\"LM\"");
    fprintf (Gbl.F.Out,"<label for=\"Grp%ld\" class=\"DAT\">"
-	              "%s"
-	              "</label>",
+	              "%s",
 	    Grp->GrpCod,
 	    Grp->GrpName);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    /***** Classroom *****/
diff --git a/swad_hierarchy.c b/swad_hierarchy.c
index 703d9b51..291183c2 100644
--- a/swad_hierarchy.c
+++ b/swad_hierarchy.c
@@ -103,8 +103,9 @@ void Hie_WriteMenuHierarchy (void)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"cty\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"cty\" class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Country);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LM\"");
@@ -120,8 +121,9 @@ void Hie_WriteMenuHierarchy (void)
       HTM_TR_Begin (NULL);
 
       HTM_TD_Begin ("class=\"RM\"");
-      fprintf (Gbl.F.Out,"<label for=\"ins\" class=\"%s\">%s:</label>",
+      fprintf (Gbl.F.Out,"<label for=\"ins\" class=\"%s\">%s:",
                The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Institution);
+      HTM_LABEL_End ();
       HTM_TD_End ();
 
       HTM_TD_Begin ("class=\"LM\"");
@@ -137,8 +139,9 @@ void Hie_WriteMenuHierarchy (void)
          HTM_TR_Begin (NULL);
 
          HTM_TD_Begin ("class=\"RM\"");
-         fprintf (Gbl.F.Out,"<label for=\"ctr\" class=\"%s\">%s:</label>",
+         fprintf (Gbl.F.Out,"<label for=\"ctr\" class=\"%s\">%s:",
                   The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Centre);
+         HTM_LABEL_End ();
          HTM_TD_End ();
 
          HTM_TD_Begin ("class=\"LM\"");
@@ -154,8 +157,9 @@ void Hie_WriteMenuHierarchy (void)
             HTM_TR_Begin (NULL);
 
 	    HTM_TD_Begin ("class=\"RM\"");
-	    fprintf (Gbl.F.Out,"<label for=\"deg\" class=\"%s\">%s:</label>",
+	    fprintf (Gbl.F.Out,"<label for=\"deg\" class=\"%s\">%s:",
                      The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Degree);
+	    HTM_LABEL_End ();
 	    HTM_TD_End ();
 
             HTM_TD_Begin ("class=\"LM\"");
@@ -171,8 +175,9 @@ void Hie_WriteMenuHierarchy (void)
 	       HTM_TR_Begin (NULL);
 
 	       HTM_TD_Begin ("class=\"RM\"");
-	       fprintf (Gbl.F.Out,"<label for=\"crs\" class=\"%s\">%s:</label>",
+	       fprintf (Gbl.F.Out,"<label for=\"crs\" class=\"%s\">%s:",
 			The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Course);
+	       HTM_LABEL_End ();
 	       HTM_TD_End ();
 
 	       HTM_TD_Begin ("class=\"LM\"");
diff --git a/swad_indicator.c b/swad_indicator.c
index de8bcc96..890440f5 100644
--- a/swad_indicator.c
+++ b/swad_indicator.c
@@ -123,8 +123,9 @@ void Ind_ReqIndicatorsCourses (void)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"ScopeInd\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"ScopeInd\" class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Scope);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LM\"");
@@ -137,8 +138,9 @@ void Ind_ReqIndicatorsCourses (void)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"OthDegTypCod\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"OthDegTypCod\" class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Types_of_degree);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"DAT LM\"");
@@ -155,9 +157,10 @@ void Ind_ReqIndicatorsCourses (void)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"%s\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"%s\" class=\"%s\">%s:",
             Dpt_PARAM_DPT_COD_NAME,
             The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Department);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LM\"");
@@ -675,7 +678,8 @@ static void Ind_ShowNumCoursesWithIndicators (unsigned NumCrssWithIndicatorYes[1
 	}
 
       HTM_TD_Begin ("class=\"%s\"",Class);
-      fprintf (Gbl.F.Out,"<label for=\"Indicators%u\">%u</label>",Ind,Ind);
+      fprintf (Gbl.F.Out,"<label for=\"Indicators%u\">%u",Ind,Ind);
+      HTM_LABEL_End ();
       HTM_TD_End ();
 
       HTM_TD_Begin ("class=\"%s\"",Class);
diff --git a/swad_info.c b/swad_info.c
index a12d794e..d03bd668 100644
--- a/swad_info.c
+++ b/swad_info.c
@@ -1166,9 +1166,10 @@ void Inf_FormsToSelSendInfo (void)
 	 HTM_TD_Begin ("class=\"LT LIGHT_BLUE\"");
       else
 	 HTM_TD_Begin ("class=\"LT\"");
-      fprintf (Gbl.F.Out,"<label for=\"InfoSrc%u\" class=\"%s\">%s</label>",
+      fprintf (Gbl.F.Out,"<label for=\"InfoSrc%u\" class=\"%s\">%s",
 	       (unsigned) InfoSrc,The_ClassFormInBox[Gbl.Prefs.Theme],
                Txt_INFO_SRC_FULL_TEXT[InfoSrc]);
+      HTM_LABEL_End ();
       if (Txt_INFO_SRC_HELP[InfoSrc])
          fprintf (Gbl.F.Out,"<span class=\"DAT\"><br />(%s)</span>",
                   Txt_INFO_SRC_HELP[InfoSrc]);
@@ -1276,10 +1277,10 @@ void Inf_FormToSendPage (Inf_InfoSrc_t InfoSrc)
    HTM_DIV_Begin ("class=\"CM\"");
    fprintf (Gbl.F.Out,"<label class=\"%s\">"
                       "%s:&nbsp;"
-                      "<input type=\"file\" name=\"%s\" />"
-                      "</label>",
+                      "<input type=\"file\" name=\"%s\" />",
             The_ClassFormInBox[Gbl.Prefs.Theme],Txt_File,
             Fil_NAME_OF_PARAM_FILENAME_ORG);
+   HTM_LABEL_End ();
    HTM_DIV_End ();
 
    /***** Send button *****/
@@ -1324,8 +1325,8 @@ void Inf_FormToSendURL (Inf_InfoSrc_t InfoSrc)
       fclose (FileURL);
       fprintf (Gbl.F.Out,"%s",Gbl.Crs.Info.URL);
      }
-   fprintf (Gbl.F.Out,"\" />"
-                      "</label>");
+   fprintf (Gbl.F.Out,"\" />");
+   HTM_LABEL_End ();
    HTM_DIV_End ();
 
    /***** Send button *****/
diff --git a/swad_institution.c b/swad_institution.c
index 3f1390b5..0c148623 100644
--- a/swad_institution.c
+++ b/swad_institution.c
@@ -354,9 +354,10 @@ static void Ins_Configuration (bool PrintView)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"OthCtyCod\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"OthCtyCod\" class=\"%s\">%s:",
 	    The_ClassFormInBox[Gbl.Prefs.Theme],
 	    Txt_Country);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"DAT LM\"");
@@ -397,9 +398,10 @@ static void Ins_Configuration (bool PrintView)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"FullName\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"FullName\" class=\"%s\">%s:",
 	    The_ClassFormInBox[Gbl.Prefs.Theme],
 	    Txt_Institution);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"DAT_N LM\"");
@@ -429,9 +431,10 @@ static void Ins_Configuration (bool PrintView)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"ShortName\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"ShortName\" class=\"%s\">%s:",
 	    The_ClassFormInBox[Gbl.Prefs.Theme],
 	    Txt_Short_name);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"DAT_N LM\"");
@@ -461,9 +464,10 @@ static void Ins_Configuration (bool PrintView)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"WWW\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"WWW\" class=\"%s\">%s:",
 	    The_ClassFormInBox[Gbl.Prefs.Theme],
 	    Txt_Web);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"DAT LM\"");
diff --git a/swad_layout.c b/swad_layout.c
index 16960d34..724d0fd0 100644
--- a/swad_layout.c
+++ b/swad_layout.c
@@ -1285,7 +1285,7 @@ void Lay_PutContextualCheckbox (Act_Action_t NextAction,
 		  Text);
 
    /***** End label and container *****/
-   fprintf (Gbl.F.Out,"</label>");
+   HTM_LABEL_End ();
    HTM_DIV_End ();
 
    /***** End form *****/
diff --git a/swad_logo.c b/swad_logo.c
index 4eb6d904..1c281538 100644
--- a/swad_logo.c
+++ b/swad_logo.c
@@ -316,12 +316,12 @@ void Log_RequestLogo (Hie_Level_t Scope)
    fprintf (Gbl.F.Out,"<label class=\"%s\">"
 	              "%s:&nbsp;"
                       "<input type=\"file\" name=\"%s\""
-                      " onchange=\"document.getElementById('%s').submit();\" />"
-	              "</label>",
+                      " onchange=\"document.getElementById('%s').submit();\" />",
             The_ClassFormInBox[Gbl.Prefs.Theme],
             Txt_File_with_the_logo,
             Fil_NAME_OF_PARAM_FILENAME_ORG,
             Gbl.Form.Id);
+   HTM_LABEL_End ();
 
    /***** End box *****/
    Box_BoxEnd ();
diff --git a/swad_mail.c b/swad_mail.c
index df2b0f5f..afea82c3 100644
--- a/swad_mail.c
+++ b/swad_mail.c
@@ -1273,10 +1273,10 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe,
 	 /* The first mail is the current one */
 	 HTM_TD_Begin ("class=\"REC_C1_BOT RT\"");
 	 fprintf (Gbl.F.Out,"<label for=\"Email\" class=\"%s\">"
-			    "%s:"
-			    "</label>",
+			    "%s:",
 		  The_ClassFormInBox[Gbl.Prefs.Theme],
 		  Txt_Current_email);
+	 HTM_LABEL_End ();
 	 HTM_TD_End ();
 
 	 HTM_TD_Begin ("class=\"REC_C2_BOT LT USR_ID\"");
@@ -1288,10 +1288,10 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe,
 	    HTM_TD_Begin ("rowspan=\"%u\" class=\"REC_C1_BOT RT\"",
 		          NumEmails - 1);
 	    fprintf (Gbl.F.Out,"<label for=\"Email\" class=\"%s\">"
-			       "%s:"
-			       "</label>",
+			       "%s:",
 		     The_ClassFormInBox[Gbl.Prefs.Theme],
 		     Txt_Other_emails);
+	    HTM_LABEL_End ();
 	    HTM_TD_End ();
 	   }
 
@@ -1376,10 +1376,11 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe,
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"REC_C1_BOT RT\"");
-   fprintf (Gbl.F.Out,"<label for=\"NewEmail\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"NewEmail\" class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],
             NumEmails ? Txt_New_email :	// A new email
         	        Txt_Email);	// The first email
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"REC_C2_BOT LT DAT\"");
diff --git a/swad_mark.c b/swad_mark.c
index 659bb88f..9535ad14 100644
--- a/swad_mark.c
+++ b/swad_mark.c
@@ -131,12 +131,12 @@ void Mrk_GetAndWriteNumRowsHeaderAndFooter (void)
                          "<input type=\"text\" name=\"%s\""
                          " size=\"1\" maxlength=\"5\" value=\"%u\""
                          " class=\"LST_EDIT_ROWS COLOR%u\""
-                         " onchange=\"document.getElementById('%s').submit();\" />"
-                         "</label>",
+                         " onchange=\"document.getElementById('%s').submit();\" />",
                Txt_TABLE_Header,
                Mrk_HeadOrFootStr[Brw_HEADER],Marks.Header,
                Gbl.RowEvenOdd,
                Gbl.Form.Id);
+      HTM_LABEL_End ();
       Frm_EndForm ();
       HTM_TD_End ();
 
@@ -151,12 +151,12 @@ void Mrk_GetAndWriteNumRowsHeaderAndFooter (void)
                          "<input type=\"text\" name=\"%s\""
                          " size=\"1\" maxlength=\"5\" value=\"%u\""
                          " class=\"LST_EDIT_ROWS COLOR%u\""
-                         " onchange=\"document.getElementById('%s').submit();\" />"
-                         "</label>",
+                         " onchange=\"document.getElementById('%s').submit();\" />",
                Txt_TABLE_Footer,
                Mrk_HeadOrFootStr[Brw_FOOTER],Marks.Footer,
                Gbl.RowEvenOdd,
                Gbl.Form.Id);
+      HTM_LABEL_End ();
       Frm_EndForm ();
       HTM_TD_End ();
      }
diff --git a/swad_match.c b/swad_match.c
index d2b55ff2..5805fbc6 100644
--- a/swad_match.c
+++ b/swad_match.c
@@ -1199,8 +1199,9 @@ static void Mch_PutFormNewMatch (struct Game *Game)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"Title\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"Title\" class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Title);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LM\"");
@@ -1268,9 +1269,9 @@ static void Mch_ShowLstGrpsToCreateMatch (void)
                          " id=\"WholeCrs\" name=\"WholeCrs\" value=\"Y\""
                          " checked=\"checked\""
                          " onclick=\"uncheckChildren(this,'GrpCods')\" />"
-	                 "%s %s"
-	                 "</label>",
+	                 "%s %s",
                Txt_The_whole_course,Gbl.Hierarchy.Crs.ShrtName);
+      HTM_LABEL_End ();
       HTM_TD_End ();
 
       HTM_TR_End ();
diff --git a/swad_message.c b/swad_message.c
index 315dc5b1..fc3392ff 100644
--- a/swad_message.c
+++ b/swad_message.c
@@ -485,9 +485,10 @@ static void Msg_WriteFormUsrsIDsOrNicksOtherRecipients (void)
    HTM_TR_Begin (NULL);
 
    HTM_TH_Begin (1,ColSpan,"LM LIGHT_BLUE");
-   fprintf (Gbl.F.Out,"<label for=\"OtherRecipients\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"OtherRecipients\">%s:",
 	    StdsAndTchsWritten ? Txt_Other_recipients :
 				 Txt_Recipients);
+   HTM_LABEL_End ();
    HTM_TH_End ();
 
    HTM_TR_End ();
@@ -536,10 +537,10 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char Content[Cns_MAX_BYTES_
 
    HTM_TD_Begin ("class=\"RT\"");
    fprintf (Gbl.F.Out,"<label for=\"MsgSubject\" class=\"%s\">"
-	              "%s:"
-	              "</label>",
+	              "%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],
             Txt_MSG_Subject);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LM\"");
@@ -589,9 +590,9 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char Content[Cns_MAX_BYTES_
 
       HTM_TD_Begin ("class=\"RT\"");
       fprintf (Gbl.F.Out,"<label for=\"MsgContent\" class=\"%s\">"
-	                 "%s:"
-	                 "</label>",
+	                 "%s:",
                The_ClassFormInBox[Gbl.Prefs.Theme],Txt_MSG_Content);
+      HTM_LABEL_End ();
       HTM_TD_End ();
 
       HTM_TD_Begin ("class=\"LM\"");
@@ -625,10 +626,10 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char Content[Cns_MAX_BYTES_
 
       HTM_TD_Begin ("class=\"RT\"");
       fprintf (Gbl.F.Out,"<label for=\"MsgContent\" class=\"%s\">"
-	                 "%s:"
-	                 "</label>",
+	                 "%s:",
                The_ClassFormInBox[Gbl.Prefs.Theme],
                Txt_MSG_Content);
+      HTM_LABEL_End ();
       HTM_TD_End ();
 
       HTM_TD_Begin ("class=\"LM\"");
@@ -2634,8 +2635,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>"
-	              "</label>");
+   fprintf (Gbl.F.Out,"</select>");
+   HTM_LABEL_End ();
   }
 
 /*****************************************************************************/
@@ -2664,11 +2665,11 @@ void Msg_ShowFormToFilterMsgs (void)
    fprintf (Gbl.F.Out,"<label class=\"%s\">"
                       "%s:&nbsp;"
                       "<input type=\"search\" name=\"FilterFromTo\""
-                      " size=\"20\" maxlength=\"%u\" value=\"%s\" />"
-                      "</label>",
+                      " size=\"20\" maxlength=\"%u\" value=\"%s\" />",
             The_ClassFormInBox[Gbl.Prefs.Theme],
             TxtFromTo[Gbl.Msg.TypeOfMessages],
             Usr_MAX_CHARS_FIRSTNAME_OR_SURNAME * 3,Gbl.Msg.FilterFromTo);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    /***** Filter message content *****/
@@ -2676,11 +2677,11 @@ void Msg_ShowFormToFilterMsgs (void)
    fprintf (Gbl.F.Out,"<label class=\"%s\">"
                       "%s:&nbsp;"
                       "<input type=\"search\" name=\"FilterContent\""
-                      " size=\"20\" maxlength=\"%u\" value=\"%s\" />"
-                      "</label>",
+                      " size=\"20\" maxlength=\"%u\" value=\"%s\" />",
             The_ClassFormInBox[Gbl.Prefs.Theme],
             Txt_MSG_Content,
             Msg_MAX_CHARS_FILTER_CONTENT,Gbl.Msg.FilterContent);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TR_End ();
@@ -2706,9 +2707,9 @@ static void Msg_ShowFormToShowOnlyUnreadMessages (void)
    if (Gbl.Msg.ShowOnlyUnreadMsgs)
       fprintf (Gbl.F.Out," checked=\"checked\"");
    fprintf (Gbl.F.Out," />"
-	              "%s"
-	              "</label>",
+	              "%s",
             Txt_only_unread_messages);
+   HTM_LABEL_End ();
   }
 
 /*****************************************************************************/
diff --git a/swad_network.c b/swad_network.c
index fda4220d..df9bca7c 100644
--- a/swad_network.c
+++ b/swad_network.c
@@ -324,9 +324,9 @@ void Net_ShowFormMyWebsAndSocialNets (void)
 	       (unsigned) NumURL,The_ClassFormInBox[Gbl.Prefs.Theme]);
       HTM_IMG (Cfg_URL_ICON_PUBLIC,Net_WebsAndSocialNetworksIcons[NumURL],Net_WebsAndSocialNetworksTitle[NumURL],
 	       "class=\"CONTEXT_ICO_16x16\" style=\"margin-right:6px;\"");
-      fprintf (Gbl.F.Out,"%s:"
-			 "</label>",
+      fprintf (Gbl.F.Out,"%s:",
 	       Net_WebsAndSocialNetworksTitle[NumURL]);
+      HTM_LABEL_End ();
       HTM_TD_End ();
 
       HTM_TD_Begin ("class=\"REC_C2_BOT LM\"");
diff --git a/swad_nickname.c b/swad_nickname.c
index 5a00a9d8..ab1873bc 100644
--- a/swad_nickname.c
+++ b/swad_nickname.c
@@ -274,10 +274,10 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its
 	 /* The first nickname is the current one */
 	 HTM_TD_Begin ("class=\"REC_C1_BOT RT\"");
 	 fprintf (Gbl.F.Out,"<label for=\"Nick\" class=\"%s\">"
-			    "%s:"
-			    "</label>",
+			    "%s:",
 		  The_ClassFormInBox[Gbl.Prefs.Theme],
 		  Txt_Current_nickname);
+	 HTM_LABEL_End ();
 	 HTM_TD_End ();
 
 	 HTM_TD_Begin ("class=\"REC_C2_BOT LT USR_ID\"");
@@ -289,10 +289,10 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its
 	    HTM_TD_Begin ("rowspan=\"%u\" class=\"REC_C1_BOT RT\"",
 		          NumNicks - 1);
 	    fprintf (Gbl.F.Out,"<label for=\"Nick\" class=\"%s\">"
-			       "%s:"
-			       "</label>",
+			       "%s:",
 		     The_ClassFormInBox[Gbl.Prefs.Theme],
 		     Txt_Other_nicknames);
+	    HTM_LABEL_End ();
 	    HTM_TD_End ();
 	   }
 
@@ -373,11 +373,11 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its
 
    HTM_TD_Begin ("class=\"REC_C1_BOT RT\"");
    fprintf (Gbl.F.Out,"<label for=\"NewNick\" class=\"%s\">"
-                      "%s:"
-                      "</label>",
+                      "%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],
             NumNicks ? Txt_New_nickname :	// A new nickname
         	       Txt_Nickname);		// The first nickname
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"REC_C2_BOT LT DAT\"");
diff --git a/swad_password.c b/swad_password.c
index 2967c055..865928a3 100644
--- a/swad_password.c
+++ b/swad_password.c
@@ -286,10 +286,10 @@ void Pwd_ShowFormSendNewPwd (void)
 	              "%s:&nbsp;"
                       "<input type=\"text\" name=\"UsrId\""
                       " size=\"8\" maxlength=\"%u\" value=\"%s\""
-                      " required=\"required\" />"
-                      "</label>",
+                      " required=\"required\" />",
             The_ClassFormInBox[Gbl.Prefs.Theme],Txt_nick_email_or_ID,
             Cns_MAX_CHARS_EMAIL_ADDRESS,Gbl.Usrs.Me.UsrIdLogin);
+   HTM_LABEL_End ();
 
    /***** Send button and end box *****/
    Box_EndBoxWithButton (Btn_CONFIRM_BUTTON,Txt_Get_a_new_password);
@@ -688,9 +688,10 @@ void Pwd_ShowFormChgMyPwd (void)
       HTM_TR_Begin (NULL);
 
       HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
-      fprintf (Gbl.F.Out,"<label for=\"UsrPwd\" class=\"%s\">%s:</label>",
+      fprintf (Gbl.F.Out,"<label for=\"UsrPwd\" class=\"%s\">%s:",
 	       The_ClassFormInBox[Gbl.Prefs.Theme],
 	       Txt_Current_password);
+      HTM_LABEL_End ();
       HTM_TD_End ();
 
       HTM_TD_Begin ("class=\"REC_C2_BOT LM\"");
@@ -741,9 +742,10 @@ void Pwd_PutFormToGetNewPasswordOnce (void)
 
    /***** Begin form element ****/
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"Passwd\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"Passwd\" class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],
             Txt_Password);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LM\"");
@@ -778,9 +780,10 @@ void Pwd_PutFormToGetNewPasswordTwice (void)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"Paswd1\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"Paswd1\" class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],
             Txt_New_password);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"REC_C2_BOT LM\"");
@@ -803,9 +806,10 @@ void Pwd_PutFormToGetNewPasswordTwice (void)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"Paswd2\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"Paswd2\" class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],
             Txt_Retype_new_password);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"REC_C2_BOT LM\"");
@@ -891,20 +895,20 @@ void Pwd_AskForConfirmationOnDangerousAction (void)
    HTM_DIV_Begin ("class=\"CM\" style=\"margin:12px;\"");
    fprintf (Gbl.F.Out,"<label class=\"%s\">"
 		      "<input type=\"checkbox\" name=\"Consent\" value=\"Y\" />"
-		      "%s"
-                      "</label>"
-		      "<br />"
+		      "%s",
+            The_ClassFormInBox[Gbl.Prefs.Theme],
+	    Txt_I_understand_that_this_action_can_not_be_undone);
+   HTM_LABEL_End ();
+   fprintf (Gbl.F.Out,"<br />"
                       "<label class=\"%s\">"
 		      "%s:&nbsp;"
 		      "<input type=\"password\" name=\"OthUsrPwd\""
 		      " size=\"16\" maxlength=\"%u\""
-		      " autocomplete=\"off\" required=\"required\" />"
-		      "</label>",
-            The_ClassFormInBox[Gbl.Prefs.Theme],
-	    Txt_I_understand_that_this_action_can_not_be_undone,
+		      " autocomplete=\"off\" required=\"required\" />",
             The_ClassFormInBox[Gbl.Prefs.Theme],
 	    Txt_For_security_enter_your_password,
 	    Pwd_MAX_CHARS_PLAIN_PASSWORD);
+   HTM_LABEL_End ();
    HTM_DIV_End ();
   }
 
diff --git a/swad_photo.c b/swad_photo.c
index 82e1d1c3..9dcd15a4 100644
--- a/swad_photo.c
+++ b/swad_photo.c
@@ -338,12 +338,12 @@ static void Pho_ReqPhoto (const struct UsrData *UsrDat)
    fprintf (Gbl.F.Out,"<label class=\"%s\">"
                       "%s:&nbsp;"
                       "<input type=\"file\" name=\"%s\" accept=\"image/*\""
-                      " onchange=\"document.getElementById('%s').submit();\" />"
-                      "</label>",
+                      " onchange=\"document.getElementById('%s').submit();\" />",
             The_ClassFormInBox[Gbl.Prefs.Theme],
             Txt_File_with_the_photo,
             Fil_NAME_OF_PARAM_FILENAME_ORG,
             Gbl.Form.Id);
+   HTM_LABEL_End ();
 
    /***** End form *****/
    Frm_EndForm ();
@@ -1791,8 +1791,9 @@ static void Pho_PutSelectorForTypeOfAvg (void)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"AvgType\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"AvgType\" class=\"%s\">%s:",
 	    The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Average_type);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LM\"");
@@ -1855,8 +1856,9 @@ static void Pho_PutSelectorForHowComputePhotoSize (void)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"PhotoSize\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"PhotoSize\" class=\"%s\">%s:",
 	    The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Size_of_photos);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LM\"");
@@ -1919,8 +1921,9 @@ static void Pho_PutSelectorForHowOrderDegrees (void)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"Order\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"Order\" class=\"%s\">%s:",
 	    The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Sort_degrees_by);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LM\"");
diff --git a/swad_privacy.c b/swad_privacy.c
index 7aaf0731..ac41505f 100644
--- a/swad_privacy.c
+++ b/swad_privacy.c
@@ -186,9 +186,9 @@ static void Pri_PutFormVisibility (const char *TxtLabel,
 	    fprintf (Gbl.F.Out," onchange=\"document.getElementById('%s').submit();\"",
 		     Gbl.Form.Id);
 	 fprintf (Gbl.F.Out," />"
-			    "%s"
-	                    "</label>",
+			    "%s",
 		  Txt_PRIVACY_OPTIONS[Visibility]);
+	 HTM_LABEL_End ();
 	 HTM_LI_End ();
 	}
 
diff --git a/swad_profile.c b/swad_profile.c
index e7857b49..3147368c 100644
--- a/swad_profile.c
+++ b/swad_profile.c
@@ -207,12 +207,12 @@ void Prf_RequestUserProfile (void)
    fprintf (Gbl.F.Out,"<label class=\"%s\">"
                       "%s:&nbsp;"
                       "<input type=\"text\" name=\"usr\""
-                      " size=\"18\" maxlength=\"%u\" value=\"@%s\" />"
-                      "</label>",
+                      " size=\"18\" maxlength=\"%u\" value=\"@%s\" />",
             The_ClassFormInBox[Gbl.Prefs.Theme],
             Txt_Nickname,
             Nck_MAX_BYTES_NICKNAME_FROM_FORM,
             Gbl.Usrs.Me.UsrDat.Nickname);
+   HTM_LABEL_End ();
 
    /***** Send button and end box *****/
    Box_EndBoxWithButton (Btn_CONFIRM_BUTTON,Txt_Continue);
diff --git a/swad_project.c b/swad_project.c
index fde197f1..47ddc4da 100644
--- a/swad_project.c
+++ b/swad_project.c
@@ -3299,8 +3299,9 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"Title\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"Title\" class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Title);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LM\"");
@@ -3316,9 +3317,10 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"%s\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"%s\" class=\"%s\">%s:",
             Dpt_PARAM_DPT_COD_NAME,
             The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Department);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LM\"");
@@ -3415,9 +3417,10 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"WWW\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"WWW\" class=\"%s\">%s:",
 	    The_ClassFormInBox[Gbl.Prefs.Theme],
 	    Txt_URL);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"DAT LM\"");
@@ -3454,8 +3457,9 @@ static void Prj_EditOneProjectTxtArea (const char *Id,
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RT\"");
-   fprintf (Gbl.F.Out,"<label for=\"%s\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"%s\" class=\"%s\">%s:",
             Id,The_ClassFormInBox[Gbl.Prefs.Theme],Label);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LT\"");
@@ -3763,9 +3767,9 @@ void Prj_ShowFormConfig (void)
    if (Gbl.Prjs.Config.Editable)
       fprintf (Gbl.F.Out," checked=\"checked\"");
    fprintf (Gbl.F.Out," />"
-		      "%s"
-		      "</label>",
+		      "%s",
 	    Txt_Editable_by_non_editing_teachers);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TR_End ();
diff --git a/swad_record.c b/swad_record.c
index 5c29072c..784b2a04 100644
--- a/swad_record.c
+++ b/swad_record.c
@@ -1507,9 +1507,9 @@ 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)",
             Txt_record_cards_per_page);
+   HTM_LABEL_End ();
   }
 
 /*****************************************************************************/
@@ -2915,8 +2915,9 @@ static void Rec_ShowRole (struct UsrData *UsrDat,
       Rol_GetRolesInAllCrssIfNotYetGot (UsrDat);
 
       HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
-      fprintf (Gbl.F.Out,"<label for=\"Role\" class=\"%s\">%s:</label>",
+      fprintf (Gbl.F.Out,"<label for=\"Role\" class=\"%s\">%s:",
 	       ClassForm,Txt_Role);
+      HTM_LABEL_End ();
       HTM_TD_End ();
 
       HTM_TD_Begin ("class=\"REC_C2_BOT REC_DAT_BOLD LM\"");
@@ -3127,9 +3128,9 @@ static void Rec_ShowRole (struct UsrData *UsrDat,
 	 if (Sex == Gbl.Usrs.Me.UsrDat.Sex)
 	    fprintf (Gbl.F.Out," checked=\"checked\"");
 	 fprintf (Gbl.F.Out," required=\"required\" />"
-			    "%s %s"
-			    "</label>",
+			    "%s %s",
 		  Usr_StringsSexIcons[Sex],Txt_SEX_SINGULAR_Abc[Sex]);
+	 HTM_LABEL_End ();
 	}
       HTM_TD_End ();
      }
@@ -3168,8 +3169,8 @@ static void Rec_ShowSurname1 (struct UsrData *UsrDat,
 	    ClassForm,Txt_Surname_1);
    if (TypeOfView == Rec_SHA_MY_RECORD_FORM)
       fprintf (Gbl.F.Out,"*");
-   fprintf (Gbl.F.Out,":"
-	              "</label>");
+   fprintf (Gbl.F.Out,":");
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"REC_C2_BOT REC_DAT_BOLD LM\"");
@@ -3206,9 +3207,9 @@ static void Rec_ShowSurname2 (struct UsrData *UsrDat,
 
    HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
    fprintf (Gbl.F.Out,"<label for=\"Surname2\" class=\"%s\">"
-		      "%s:"
-		      "</label>",
+		      "%s:",
 	    ClassForm,Txt_Surname_2);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"REC_C2_BOT REC_DAT_BOLD LM\"");
@@ -3245,8 +3246,8 @@ static void Rec_ShowFirstName (struct UsrData *UsrDat,
 	    ClassForm,Txt_First_name);
    if (TypeOfView == Rec_SHA_MY_RECORD_FORM)
       fprintf (Gbl.F.Out,"*");
-   fprintf (Gbl.F.Out,":"
-                      "</label>");
+   fprintf (Gbl.F.Out,":");
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("colspan=\"2\" class=\"REC_C2_BOT REC_DAT_BOLD LM\"");
@@ -3295,7 +3296,8 @@ static void Rec_ShowCountry (struct UsrData *UsrDat,
 	    ClassForm,Txt_Country);
    if (TypeOfView == Rec_SHA_MY_RECORD_FORM)
       fprintf (Gbl.F.Out,"*");
-   fprintf (Gbl.F.Out,":</label>");
+   fprintf (Gbl.F.Out,":");
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("colspan=\"2\" class=\"REC_C2_BOT LM\"");
@@ -3340,9 +3342,9 @@ static void Rec_ShowOriginPlace (struct UsrData *UsrDat,
 
    HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
    fprintf (Gbl.F.Out,"<label for=\"OriginPlace\" class=\"%s\">"
-		      "%s:"
-                      "</label>",
+		      "%s:",
 	    ClassForm,Txt_Place_of_origin);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"REC_C2_BOT REC_DAT_BOLD LM\"");
@@ -3410,9 +3412,9 @@ static void Rec_ShowLocalAddress (struct UsrData *UsrDat,
 
    HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
    fprintf (Gbl.F.Out,"<label for=\"LocalAddress\" class=\"%s\">"
-		      "%s:"
-		      "</label>",
+		      "%s:",
 	    ClassForm,Txt_Local_address);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"REC_C2_BOT REC_DAT_BOLD LM\"");
@@ -3447,9 +3449,9 @@ static void Rec_ShowLocalPhone (struct UsrData *UsrDat,
 
    HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
    fprintf (Gbl.F.Out,"<label for=\"LocalPhone\" class=\"%s\">"
-		      "%s:"
-                      "</label>",
+		      "%s:",
 	    ClassForm,Txt_Phone);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"REC_C2_BOT REC_DAT_BOLD LM\"");
@@ -3488,9 +3490,9 @@ static void Rec_ShowFamilyAddress (struct UsrData *UsrDat,
 
    HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
    fprintf (Gbl.F.Out,"<label for=\"FamilyAddress\" class=\"%s\">"
-		      "%s:"
-		      "</label>",
+		      "%s:",
 	    ClassForm,Txt_Family_address);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"REC_C2_BOT REC_DAT_BOLD LM\"");
@@ -3525,9 +3527,9 @@ static void Rec_ShowFamilyPhone (struct UsrData *UsrDat,
 
    HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
    fprintf (Gbl.F.Out,"<label for=\"FamilyPhone\" class=\"%s\">"
-		      "%s:"
-		      "</label>",
+		      "%s:",
 	    ClassForm,Txt_Phone);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"REC_C2_BOT REC_DAT_BOLD LM\"");
@@ -3565,8 +3567,9 @@ static void Rec_ShowComments (struct UsrData *UsrDat,
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"REC_C1_BOT RT\"");
-   fprintf (Gbl.F.Out,"<label for=\"Comments\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"Comments\" class=\"%s\">%s:",
 	    ClassForm,Txt_USER_comments);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"REC_C2_BOT REC_DAT_BOLD LT\"");
@@ -4044,8 +4047,9 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"OthCtyCod\" class=\"%s\">%s*:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"OthCtyCod\" class=\"%s\">%s*:",
             ClassForm,Txt_Country);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"REC_C2_BOT LM\"");
@@ -4088,8 +4092,9 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"OthInsCod\" class=\"%s\">%s*:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"OthInsCod\" class=\"%s\">%s*:",
             ClassForm,Txt_Institution);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"REC_C2_BOT LM\"");
@@ -4137,8 +4142,9 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher)
       HTM_TR_Begin (NULL);
 
       HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
-      fprintf (Gbl.F.Out,"<label for=\"OthCtrCod\" class=\"%s\">%s*:</label>",
+      fprintf (Gbl.F.Out,"<label for=\"OthCtrCod\" class=\"%s\">%s*:",
 	       ClassForm,Txt_Centre);
+      HTM_LABEL_End ();
       HTM_TD_End ();
 
       HTM_TD_Begin ("class=\"REC_C2_BOT LM\"");
@@ -4184,8 +4190,9 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher)
       HTM_TR_Begin (NULL);
 
       HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
-      fprintf (Gbl.F.Out,"<label for=\"%s\" class=\"%s\">%s*:</label>",
+      fprintf (Gbl.F.Out,"<label for=\"%s\" class=\"%s\">%s*:",
 	       Dpt_PARAM_DPT_COD_NAME,ClassForm,Txt_Department);
+      HTM_LABEL_End ();
       HTM_TD_End ();
 
       HTM_TD_Begin ("class=\"REC_C2_BOT LM\"");
@@ -4206,9 +4213,9 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher)
 
       HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
       fprintf (Gbl.F.Out,"<label for=\"Office\" class=\"%s\">"
-	                 "%s:"
-	                 "</label>",
+	                 "%s:",
                ClassForm,Txt_Office);
+      HTM_LABEL_End ();
       HTM_TD_End ();
 
       HTM_TD_Begin ("class=\"REC_C2_BOT LM\"");
@@ -4230,9 +4237,9 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher)
 
       HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
       fprintf (Gbl.F.Out,"<label for=\"OfficePhone\" class=\"%s\">"
-	                 "%s:"
-                         "</label>",
+	                 "%s:",
                ClassForm,Txt_Phone);
+      HTM_LABEL_End ();
       HTM_TD_End ();
 
       HTM_TD_Begin ("class=\"REC_C2_BOT LM\"");
diff --git a/swad_role.c b/swad_role.c
index cfbbbf17..14261729 100644
--- a/swad_role.c
+++ b/swad_role.c
@@ -28,6 +28,7 @@
 #include "swad_database.h"
 #include "swad_form.h"
 #include "swad_global.h"
+#include "swad_HTML.h"
 #include "swad_parameter.h"
 #include "swad_role.h"
 #include "swad_role_type.h"
@@ -560,10 +561,9 @@ void Rol_WriteSelectorRoles (unsigned RolesAllowed,unsigned RolesSelected,
 		     Gbl.Form.Id);
 
 	 fprintf (Gbl.F.Out," />"
-	                    "%s"
-	                    "</label>"
-	                    "<br />",
-		  Txt_ROLES_PLURAL_abc[Role][Usr_SEX_UNKNOWN]);
+	                    "%s",Txt_ROLES_PLURAL_abc[Role][Usr_SEX_UNKNOWN]);
+	 HTM_LABEL_End ();
+	 fprintf (Gbl.F.Out,"<br />");
         }
   }
 
diff --git a/swad_search.c b/swad_search.c
index 57150619..315038a5 100644
--- a/swad_search.c
+++ b/swad_search.c
@@ -155,7 +155,7 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Hie
    Gbl.Scope.Default = DefaultScope;
    Sco_GetScope ("ScopeSch");
    Sco_PutSelectorScope ("ScopeSch",false);
-   fprintf (Gbl.F.Out,"</label>");
+   HTM_LABEL_End ();
    HTM_DIV_End ();
 
    /***** String to find *****/
@@ -178,8 +178,8 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Hie
 	 fprintf (Gbl.F.Out,">%s</option>",
 		  Titles[WhatToSearch]);
         }
-   fprintf (Gbl.F.Out,"</select>"
-	              "</label>");
+   fprintf (Gbl.F.Out,"</select>");
+   HTM_LABEL_End ();
 
    /***** Magnifying glass icon *****/
    Sch_PutMagnifyingGlassButton ("search.svg");
diff --git a/swad_statistic.c b/swad_statistic.c
index 6bceaac3..c8a9ee8e 100644
--- a/swad_statistic.c
+++ b/swad_statistic.c
@@ -432,8 +432,9 @@ void Sta_AskShowCrsHits (void)
 	       fprintf (Gbl.F.Out," selected=\"selected\"");
             fprintf (Gbl.F.Out,">%s",Txt_STAT_CLICKS_GROUPED_BY[ClicksGroupedBy]);
            }
-         fprintf (Gbl.F.Out,"</select>"
-                            "</label><br />");
+         fprintf (Gbl.F.Out,"</select>");
+         HTM_LABEL_End ();
+         fprintf (Gbl.F.Out,"<br />");
 
          /***** Option b) Listing of detailed clicks to this course *****/
          fprintf (Gbl.F.Out,"<label>"
@@ -443,9 +444,9 @@ void Sta_AskShowCrsHits (void)
          if (Gbl.Stat.ClicksGroupedBy == Sta_CLICKS_CRS_DETAILED_LIST)
             fprintf (Gbl.F.Out," checked=\"checked\"");
          fprintf (Gbl.F.Out," onclick=\"enableDetailedClicks()\" />"
-                            "%s"
-                            "</label>",
+                            "%s",
                   Txt_STAT_CLICKS_GROUPED_BY[Sta_CLICKS_CRS_DETAILED_LIST]);
+         HTM_LABEL_End ();
 
          /* Number of rows per page */
          // To use getElementById in Firefox, it's necessary to have the id attribute
@@ -465,8 +466,8 @@ void Sta_AskShowCrsHits (void)
 	       fprintf (Gbl.F.Out," selected=\"selected\"");
             fprintf (Gbl.F.Out,">%lu",RowsPerPage[i]);
            }
-         fprintf (Gbl.F.Out,"</select>)"
-                            "</label>");
+         fprintf (Gbl.F.Out,"</select>)");
+         HTM_LABEL_End ();
          HTM_TD_End ();
 
          HTM_TR_End ();
@@ -539,8 +540,9 @@ void Sta_AskShowGblHits (void)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"Role\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"Role\" class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Users);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("colspan=\"2\" class=\"LM\"");
@@ -566,8 +568,9 @@ void Sta_AskShowGblHits (void)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"ScopeSta\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"ScopeSta\" class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Scope);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("colspan=\"2\" class=\"LM\"");
@@ -588,8 +591,9 @@ void Sta_AskShowGblHits (void)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"CountType\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"CountType\" class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Show);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("colspan=\"2\" class=\"LM\"");
@@ -614,8 +618,8 @@ void Sta_AskShowGblHits (void)
 	 fprintf (Gbl.F.Out," selected=\"selected\"");
       fprintf (Gbl.F.Out,">%s",Txt_STAT_CLICKS_GROUPED_BY[ClicksGroupedBy]);
      }
-   fprintf (Gbl.F.Out,"</select>"
-	              "</label>");
+   fprintf (Gbl.F.Out,"</select>");
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TR_End ();
@@ -708,8 +712,9 @@ static void Sta_WriteSelectorAction (void)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"StatAct\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"StatAct\" class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Action);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("colspan=\"2\" class=\"LM\"");
@@ -2084,8 +2089,8 @@ static void Sta_ShowDistrAccessesPerDayAndHour (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>"
-	              "</label>");
+   fprintf (Gbl.F.Out,"</select>");
+   HTM_LABEL_End ();
    Frm_EndForm ();
    HTM_TD_End ();
    HTM_TR_End ();
diff --git a/swad_survey.c b/swad_survey.c
index 543344ad..068e736f 100644
--- a/swad_survey.c
+++ b/swad_survey.c
@@ -1893,9 +1893,10 @@ void Svy_RequestCreatOrEditSvy (void)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"ScopeSvy\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"ScopeSvy\" class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],
             Txt_Scope);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LM\"");
@@ -1910,9 +1911,10 @@ void Svy_RequestCreatOrEditSvy (void)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"Title\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"Title\" class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],
             Txt_Title);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LM\"");
@@ -1931,9 +1933,10 @@ void Svy_RequestCreatOrEditSvy (void)
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RT\"");
-   fprintf (Gbl.F.Out,"<label for=\"Txt\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"Txt\" class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],
             Txt_Description);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LT\"");
@@ -2098,9 +2101,9 @@ static void Svy_ShowLstGrpsToEditSurvey (long SvyCod)
       if (!Svy_CheckIfSvyIsAssociatedToGrps (SvyCod))
          fprintf (Gbl.F.Out," checked=\"checked\"");
       fprintf (Gbl.F.Out," onclick=\"uncheckChildren(this,'GrpCods')\" />"
-	                 "%s %s"
-	                 "</label>",
+	                 "%s %s",
                Txt_The_whole_course,Gbl.Hierarchy.Crs.ShrtName);
+      HTM_LABEL_End ();
       HTM_TD_End ();
 
       HTM_TR_End ();
@@ -2725,8 +2728,9 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RT\"");
-   fprintf (Gbl.F.Out,"<label for=\"Txt\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"Txt\" class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Wording);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LT\"");
@@ -2756,9 +2760,9 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,
       if (AnsType == SvyQst->AnswerType)
          fprintf (Gbl.F.Out," checked=\"checked\"");
       fprintf (Gbl.F.Out," />"
-	                 "%s"
-	                 "</label><br />",
-               Txt_SURVEY_STR_ANSWER_TYPES[AnsType]);
+	                 "%s",Txt_SURVEY_STR_ANSWER_TYPES[AnsType]);
+      HTM_LABEL_End ();
+      fprintf (Gbl.F.Out,"<br />");
      }
    HTM_TD_End ();
 
@@ -2780,8 +2784,9 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,
 
       /* Label with the number of the answer */
       HTM_TD_Begin ("class=\"RT\"");
-      fprintf (Gbl.F.Out,"<label for=\"AnsStr%u\" class=\"%s\">%u)</label>",
+      fprintf (Gbl.F.Out,"<label for=\"AnsStr%u\" class=\"%s\">%u)",
                NumAns,The_ClassFormInBox[Gbl.Prefs.Theme],NumAns + 1);
+      HTM_LABEL_End ();
       HTM_TD_End ();
 
       /* Answer text */
@@ -3464,16 +3469,17 @@ static void Svy_WriteAnswersOfAQst (struct Survey *Svy,
 	 /* Write the number of option */
 	 HTM_TD_Begin ("class=\"SVY_OPT LT\"");
 	 fprintf (Gbl.F.Out,"<label for=\"Ans%010u_%010u\" class=\"DAT\">"
-			    "%u)"
-			    "</label>",
+			    "%u)",
 		  (unsigned) SvyQst->QstCod,NumAns,NumAns + 1);
+	 HTM_LABEL_End ();
 	 HTM_TD_End ();
 
 	 /* Write the text of the answer */
 	 HTM_TD_Begin ("class=\"LT\"");
-	 fprintf (Gbl.F.Out,"<label for=\"Ans%010u_%010u\" class=\"DAT\">%s</label>",
+	 fprintf (Gbl.F.Out,"<label for=\"Ans%010u_%010u\" class=\"DAT\">%s",
 		  (unsigned) SvyQst->QstCod,NumAns,
 		  SvyQst->AnsChoice[NumAns].Text);
+	 HTM_LABEL_End ();
 	 HTM_TD_End ();
 
 	 /* Show stats of this answer */
diff --git a/swad_syllabus.c b/swad_syllabus.c
index 906e6eef..2b3c7867 100644
--- a/swad_syllabus.c
+++ b/swad_syllabus.c
@@ -155,9 +155,9 @@ void Syl_PutFormWhichSyllabus (void)
       if (WhichSyllabus == Gbl.Syllabus.WhichSyllabus)
          fprintf (Gbl.F.Out," checked=\"checked\"");
       fprintf (Gbl.F.Out," onclick=\"document.getElementById('%s').submit();\" />"
-	                 "%s"
-                         "</label>",
+	                 "%s",
                Gbl.Form.Id,Txt_SYLLABUS_WHICH_SYLLABUS[WhichSyllabus]);
+      HTM_LABEL_End ();
       HTM_LI_End ();
      }
    HTM_UL_End ();
diff --git a/swad_test.c b/swad_test.c
index 39a082e8..8d2f5ac4 100644
--- a/swad_test.c
+++ b/swad_test.c
@@ -355,9 +355,9 @@ void Tst_ShowFormAskTst (void)
 
          HTM_TD_Begin ("class=\"RM\"");
          fprintf (Gbl.F.Out,"<label for=\"NumQst\" class=\"%s\">"
-                            "%s:"
-                            "</label>",
+                            "%s:",
                   The_ClassFormInBox[Gbl.Prefs.Theme],Txt_No_of_questions);
+         HTM_LABEL_End ();
          HTM_TD_End ();
 
          HTM_TD_Begin ("class=\"LM\"");
@@ -479,9 +479,9 @@ void Tst_ShowNewTest (void)
 	    if (Gbl.Test.AllowTeachers)
 	       fprintf (Gbl.F.Out," checked=\"checked\"");
 	    fprintf (Gbl.F.Out," />"
-		               "&nbsp;%s"
-	                       "</label>",
+		               "&nbsp;%s",
 		     Txt_Allow_teachers_to_consult_this_test);
+	    HTM_LABEL_End ();
 	    HTM_DIV_End ();
 
             /***** End form *****/
@@ -1146,9 +1146,10 @@ static void Tst_PutFormToEditQstMedia (struct Media *Media,int NumMediaInForm,
       if (OptionsDisabled)
 	 fprintf (Gbl.F.Out," disabled=\"disabled\"");
       fprintf (Gbl.F.Out," />"
-			 "%s"
-			 "</label><br />",
+			 "%s",
 	       Txt_No_image_video);
+      HTM_LABEL_End ();
+      fprintf (Gbl.F.Out,"<br />");
 
       /***** Choice 2: Current media *****/
       fprintf (Gbl.F.Out,"<label class=\"%s\">"
@@ -1159,9 +1160,9 @@ static void Tst_PutFormToEditQstMedia (struct Media *Media,int NumMediaInForm,
       if (OptionsDisabled)
 	 fprintf (Gbl.F.Out," disabled=\"disabled\"");
       fprintf (Gbl.F.Out," />"
-			 "%s"
-			 "</label>",
+			 "%s",
 	       Txt_Current_image_video);
+      HTM_LABEL_End ();
       Med_ShowMedia (Media,
 	             "TEST_MED_EDIT_ONE_CONTAINER",
 		     "TEST_MED_EDIT_ONE");
@@ -1177,9 +1178,9 @@ static void Tst_PutFormToEditQstMedia (struct Media *Media,int NumMediaInForm,
       if (OptionsDisabled)
 	 fprintf (Gbl.F.Out," disabled=\"disabled\"");
       fprintf (Gbl.F.Out," />"
-			 "%s: "
-			 "</label>",
+			 "%s: ",
 	       Txt_Change_image_video);
+      HTM_LABEL_End ();
       Med_PutMediaUploader (NumMediaInForm,"TEST_MED_INPUT");
 
       /***** End container *****/
@@ -1717,9 +1718,9 @@ static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res,
    if (Gbl.Test.Tags.All)
       fprintf (Gbl.F.Out," checked=\"checked\"");
    fprintf (Gbl.F.Out," onclick=\"togglecheckChildren(this,'ChkTag');\" />"
-                      "&nbsp;%s"
-                      "</label>",
+                      "&nbsp;%s",
             Txt_All_tags);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TR_End ();
@@ -1760,9 +1761,9 @@ static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res,
            }
         }
       fprintf (Gbl.F.Out," onclick=\"checkParent(this,'AllTags');\" />"
-	                 "&nbsp;%s"
-	                 "</label>",
+	                 "&nbsp;%s",
 	       row[1]);
+      HTM_LABEL_End ();
       HTM_TD_End ();
 
       HTM_TR_End ();
@@ -1929,9 +1930,10 @@ static void Tst_ShowFormConfigTst (void)
       if (Pluggable == Gbl.Test.Config.Pluggable)
          fprintf (Gbl.F.Out," checked=\"checked\"");
       fprintf (Gbl.F.Out," />"
-	                 "%s"
-	                 "</label><br />",
+	                 "%s",
                Txt_TST_PLUGGABLE[Pluggable]);
+      HTM_LABEL_End ();
+      fprintf (Gbl.F.Out,"<br />");
      }
    HTM_TD_End ();
 
@@ -1962,10 +1964,10 @@ static void Tst_ShowFormConfigTst (void)
 
    HTM_TD_Begin ("class=\"RT\"");
    fprintf (Gbl.F.Out,"<label for=\"MinTimeNxtTstPerQst\" class=\"%s\">"
-	              "%s:"
-	              "</label>",
+	              "%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],
             Txt_Minimum_time_seconds_per_question_between_two_tests);
+    HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LB\"");
@@ -1996,9 +1998,10 @@ static void Tst_ShowFormConfigTst (void)
       if (Feedback == Gbl.Test.Config.Feedback)
          fprintf (Gbl.F.Out," checked=\"checked\"");
       fprintf (Gbl.F.Out," />"
-	                 "%s"
-	                 "</label><br />",
+	                 "%s",
                Txt_TST_STR_FEEDBACK[Feedback]);
+      HTM_LABEL_End ();
+      fprintf (Gbl.F.Out,"<br />");
      }
    HTM_TD_End ();
 
@@ -2025,8 +2028,9 @@ static void Tst_PutInputFieldNumQst (const char *Field,const char *Label,
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RM\"");
-   fprintf (Gbl.F.Out,"<label for=\"%s\" class=\"DAT\">%s</label>",
+   fprintf (Gbl.F.Out,"<label for=\"%s\" class=\"DAT\">%s",
            Field,Label);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LM\"");
@@ -2346,9 +2350,9 @@ static void Tst_ShowFormAnswerTypes (unsigned NumCols)
    if (Gbl.Test.AllAnsTypes)
       fprintf (Gbl.F.Out," checked=\"checked\"");
    fprintf (Gbl.F.Out," onclick=\"togglecheckChildren(this,'AnswerType');\" />"
-                      "&nbsp;%s"
-                      "</label>",
+                      "&nbsp;%s",
             Txt_All_types_of_answers);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TR_End ();
@@ -2372,9 +2376,9 @@ static void Tst_ShowFormAnswerTypes (unsigned NumCols)
             fprintf (Gbl.F.Out," checked=\"checked\"");
         }
       fprintf (Gbl.F.Out," onclick=\"checkParent(this,'AllAnsTypes');\" />"
-	                 "&nbsp;%s"
-	                 "</label>",
+	                 "&nbsp;%s",
                Txt_TST_STR_ANSWER_TYPES[AnsType]);
+      HTM_LABEL_End ();
       HTM_TD_End ();
 
       HTM_TR_End ();
@@ -3738,19 +3742,19 @@ static void Tst_WriteChoiceAnsViewTest (unsigned NumQst,long QstCod,bool Shuffle
 
       HTM_TD_Begin ("class=\"LT\"");
       fprintf (Gbl.F.Out,"<label for=\"Ans%06u_%u\" class=\"ANS_TXT\">"
-	                 "%c)&nbsp;"
-	                 "</label>",
+	                 "%c)&nbsp;",
 	       NumQst,NumOpt,
 	       'a' + (char) NumOpt);
+      HTM_LABEL_End ();
       HTM_TD_End ();
 
       /***** Write the option text *****/
       HTM_TD_Begin ("class=\"LT\"");
       fprintf (Gbl.F.Out,"<label for=\"Ans%06u_%u\" class=\"ANS_TXT\">"
-	                 "%s"
-	                 "</label>",
+	                 "%s",
                NumQst,NumOpt,
                Gbl.Test.Answer.Options[NumOpt].Text);
+      HTM_LABEL_End ();
       Med_ShowMedia (&Gbl.Test.Answer.Options[NumOpt].Media,
                      "TEST_MED_SHOW_CONTAINER",
                      "TEST_MED_SHOW");
@@ -4193,11 +4197,11 @@ void Tst_WriteChoiceAnsViewMatch (long MchCod,unsigned QstInd,long QstCod,
       /***** Write the option text and the result *****/
       HTM_TD_Begin ("class=\"LT\"");
       fprintf (Gbl.F.Out,"<label for=\"Ans%06u_%u\" class=\"%s\">"
-	                 "%s"
-	                 "</label>",
+	                 "%s",
                QstInd,NumOpt,
 	       Class,
                Gbl.Test.Answer.Options[Indexes[NumOpt]].Text);
+      HTM_LABEL_End ();
       Med_ShowMedia (&Gbl.Test.Answer.Options[Indexes[NumOpt]].Media,
                      "TEST_MED_SHOW_CONTAINER",
                      "TEST_MED_SHOW");
@@ -5152,9 +5156,10 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
    HTM_TR_Begin (NULL);
 
    HTM_TD_Begin ("class=\"RT\"");
-   fprintf (Gbl.F.Out,"<label for=\"Stem\" class=\"%s\">%s:</label>",
+   fprintf (Gbl.F.Out,"<label for=\"Stem\" class=\"%s\">%s:",
             The_ClassFormInBox[Gbl.Prefs.Theme],
             Txt_Wording);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TD_Begin ("class=\"LT\"");
@@ -5176,7 +5181,7 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
       if (Feedback[0])
 	 fprintf (Gbl.F.Out,"%s",Feedback);
    HTM_TEXTAREA_End ();
-   fprintf (Gbl.F.Out,"</label>");
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TR_End ();
@@ -5199,9 +5204,10 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
       if (AnsType == Gbl.Test.AnswerType)
          fprintf (Gbl.F.Out," checked=\"checked\"");
       fprintf (Gbl.F.Out," onclick=\"enableDisableAns(this.form);\" />"
-	                 "%s&nbsp;"
-	                 "</label><br />",
+	                 "%s&nbsp;",
                Txt_TST_STR_ANSWER_TYPES[AnsType]);
+      HTM_LABEL_End ();
+      fprintf (Gbl.F.Out,"<br />");
      }
    HTM_TD_End ();
 
@@ -5224,8 +5230,8 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
             Gbl.Test.Answer.Integer);
    if (Gbl.Test.AnswerType != Tst_ANS_INT)
       fprintf (Gbl.F.Out," disabled=\"disabled\"");
-   fprintf (Gbl.F.Out," required=\"required\" />"
-                      "</label>");
+   fprintf (Gbl.F.Out," required=\"required\" />");
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TR_End ();
@@ -5265,9 +5271,9 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
        Gbl.Test.AnswerType != Tst_ANS_MULTIPLE_CHOICE)
       fprintf (Gbl.F.Out," disabled=\"disabled\"");
    fprintf (Gbl.F.Out," />"
-	              "%s"
-                      "</label>",
+	              "%s",
             Txt_Shuffle);
+   HTM_LABEL_End ();
    HTM_TD_End ();
 
    HTM_TR_End ();
@@ -5385,7 +5391,7 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
          if (Gbl.Test.Answer.Options[NumOpt].Feedback[0])
             fprintf (Gbl.F.Out,"%s",Gbl.Test.Answer.Options[NumOpt].Feedback);
       HTM_TEXTAREA_End ();
-      fprintf (Gbl.F.Out,"</label>");
+      HTM_LABEL_End ();
 
       /* End of right column */
       HTM_DIV_End ();
@@ -5432,8 +5438,8 @@ static void Tst_PutFloatInputField (const char *Label,const char *Field,
             Value);
    if (Gbl.Test.AnswerType != Tst_ANS_FLOAT)
       fprintf (Gbl.F.Out," disabled=\"disabled\"");
-   fprintf (Gbl.F.Out," required=\"required\" />"
-	              "</label>");
+   fprintf (Gbl.F.Out," required=\"required\" />");
+   HTM_LABEL_End ();
   }
 
 /*****************************************************************************/
@@ -5452,9 +5458,9 @@ static void Tst_PutTFInputField (const char *Label,char Value)
    if (Gbl.Test.AnswerType != Tst_ANS_TRUE_FALSE)
       fprintf (Gbl.F.Out," disabled=\"disabled\"");
    fprintf (Gbl.F.Out," required=\"required\" />"
-	              "%s"
-	              "</label>",
+	              "%s",
 	    Label);
+   HTM_LABEL_End ();
   }
 
 /*****************************************************************************/
diff --git a/swad_test_import.c b/swad_test_import.c
index fc316f39..85191aba 100644
--- a/swad_test_import.c
+++ b/swad_test_import.c
@@ -144,12 +144,12 @@ void TsI_ShowFormImportQstsFromXML (void)
    fprintf (Gbl.F.Out,"<label class=\"%s\">"
                       "%s:&nbsp;"
                       "<input type=\"file\" name=\"%s\" accept=\".xml\""
-                      " onchange=\"document.getElementById('%s').submit();\" />"
-                      "</label>",
+                      " onchange=\"document.getElementById('%s').submit();\" />",
             The_ClassFormInBox[Gbl.Prefs.Theme],
             Txt_XML_file,
             Fil_NAME_OF_PARAM_FILENAME_ORG,
             Gbl.Form.Id);
+   HTM_LABEL_End ();
    Frm_EndForm ();
 
    /***** End box *****/
diff --git a/swad_timetable.c b/swad_timetable.c
index 6effc3aa..556a26d5 100644
--- a/swad_timetable.c
+++ b/swad_timetable.c
@@ -1663,14 +1663,14 @@ static void TT_TimeTableDrawCell (unsigned Weekday,unsigned Interval,unsigned Co
 	       /***** Group *****/
 	       fprintf (Gbl.F.Out,"<br />"
 		                  "<label for=\"TTGrp%s\">"
-		                  "%s"
-		                  "</label>"
-	                          "<select id=\"TTGrp%s\" name=\"TTGrp\""
+		                  "%s",
+			CellStr,
+		        Txt_Group);
+	       HTM_LABEL_End ();
+	       fprintf (Gbl.F.Out,"<select id=\"TTGrp%s\" name=\"TTGrp\""
 	                          " class=\"TT_GRP\""
 		                  " onchange=\"document.getElementById('%s').submit();\">",
 			CellStr,
-		        Txt_Group,
-			CellStr,
 			Gbl.Form.Id);
                fprintf (Gbl.F.Out,"<option value=\"-1\"");
 	       if (GrpCod <= 0)
@@ -1705,15 +1705,15 @@ static void TT_TimeTableDrawCell (unsigned Weekday,unsigned Interval,unsigned Co
 	       /***** Info *****/
 	       fprintf (Gbl.F.Out,"<br />"
 		                  "<label for=\"TTInf%s\">"
-		                  "%s"
-		                  "</label>"
-	                          "<input id=\"TTInf%s\" name=\"TTInf\""
+		                  "%s",
+			CellStr,
+		        Txt_Info);
+	       HTM_LABEL_End ();
+	       fprintf (Gbl.F.Out,"<input id=\"TTInf%s\" name=\"TTInf\""
 	                          " type=\"text\" size=\"1\" maxlength=\"%u\""
 	                          " value=\"%s\" class=\"TT_INF\""
 		                  " onchange=\"document.getElementById('%s').submit();\" />",
 			CellStr,
-		        Txt_Info,
-			CellStr,
 			TT_MAX_CHARS_INFO,
 			Info ? Info :
 			       "",
@@ -1724,15 +1724,15 @@ static void TT_TimeTableDrawCell (unsigned Weekday,unsigned Interval,unsigned Co
 	       /***** Info *****/
 	       fprintf (Gbl.F.Out,"<br />"
 		                  "<label for=\"TTInf%s\" class=\"DAT_SMALL\">"
-		                  "%s"
-		                  "</label>"
-                                  "<input id=\"TTInf%s\" name=\"TTInf\""
+		                  "%s",
+			CellStr,
+		        Txt_Info);
+	       HTM_LABEL_End ();
+               fprintf (Gbl.F.Out,"<input id=\"TTInf%s\" name=\"TTInf\""
                                   " type=\"text\" size=\"12\" maxlength=\"%u\""
                                   " value=\"%s\" class=\"TT_INF\""
 		                  " onchange=\"document.getElementById('%s').submit();\" />",
 			CellStr,
-		        Txt_Info,
-			CellStr,
 			TT_MAX_CHARS_INFO,Info,
 			Gbl.Form.Id);
 	      }
diff --git a/swad_user.c b/swad_user.c
index 646258d6..2748d6ec 100644
--- a/swad_user.c
+++ b/swad_user.c
@@ -2609,7 +2609,7 @@ void Usr_WriteFormLogin (Act_Action_t NextAction,void (*FuncParams) (void))
    HTM_DIV_Begin ("class=\"LM\"");
    fprintf (Gbl.F.Out,"<label for=\"UsrId\">");
    Ico_PutIcon ("user.svg",Txt_User[Usr_SEX_UNKNOWN],"CONTEXT_ICO_16x16");
-   fprintf (Gbl.F.Out,"</label>");
+   HTM_LABEL_End ();
    fprintf (Gbl.F.Out,"<input type=\"text\" id=\"UsrId\" name=\"UsrId\""
                       " size=\"18\" maxlength=\"%u\" placeholder=\"%s\""
                       " value=\"%s\""
@@ -2623,7 +2623,7 @@ void Usr_WriteFormLogin (Act_Action_t NextAction,void (*FuncParams) (void))
    HTM_DIV_Begin ("class=\"LM\"");
    fprintf (Gbl.F.Out,"<label for=\"UsrPwd\">");
    Ico_PutIcon ("key.svg",Txt_Password,"CONTEXT_ICO_16x16");
-   fprintf (Gbl.F.Out,"</label>");
+   HTM_LABEL_End ();
    fprintf (Gbl.F.Out,"<input type=\"password\" id=\"UsrPwd\" name=\"UsrPwd\""
 		      " size=\"18\" maxlength=\"%u\" placeholder=\"%s\" />",
             Pwd_MAX_CHARS_PLAIN_PASSWORD,
@@ -3510,7 +3510,7 @@ void Usr_ShowFormsLogoutAndRole (void)
       fprintf (Gbl.F.Out,"<label class=\"%s\">%s:&nbsp;",
                The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Role);
       Rol_PutFormToChangeMyRole (NULL);
-      fprintf (Gbl.F.Out,"</label>");
+      HTM_LABEL_End ();
      }
 
    /***** End box *****/
@@ -6306,10 +6306,10 @@ void Usr_PutCheckboxToSelectAllUsers (Rol_Role_t Role)
    else
       Rol_WrongRoleExit ();
    Sex = Usr_GetSexOfUsrsLst (Role);
-   fprintf (Gbl.F.Out,"%s:"
-	              "</label>",
+   fprintf (Gbl.F.Out,"%s:",
 	    Gbl.Usrs.LstUsrs[Role].NumUsrs == 1 ? Txt_ROLES_SINGUL_Abc[Role][Sex] :
                                                   Txt_ROLES_PLURAL_Abc[Role][Sex]);
+   HTM_LABEL_End ();
 
    HTM_TH_End ();
 
@@ -6405,9 +6405,9 @@ static void Usr_PutCheckboxListWithPhotos (void)
    if (Gbl.Usrs.Listing.WithPhotos)
       fprintf (Gbl.F.Out," checked=\"checked\"");
    fprintf (Gbl.F.Out," onclick=\"document.getElementById('%s').submit();\" />"
-                      "%s"
-                      "</label>",
+                      "%s",
 	    Gbl.Form.Id,Txt_Display_photos);
+   HTM_LABEL_End ();
   }
 
 /*****************************************************************************/
@@ -7331,7 +7331,7 @@ void Usr_ListDataAdms (void)
    fprintf (Gbl.F.Out,"<label class=\"%s\">%s:&nbsp;",
 	    The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Scope);
    Sco_PutSelectorScope ("ScopeUsr",true);
-   fprintf (Gbl.F.Out,"</label>");
+   HTM_LABEL_End ();
    Frm_EndForm ();
    HTM_DIV_End ();
 
@@ -7798,7 +7798,7 @@ void Usr_SeeGuests (void)
       fprintf (Gbl.F.Out,"<label class=\"%s\">%s:&nbsp;",
 	       The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Scope);
       Sco_PutSelectorScope ("ScopeUsr",true);
-      fprintf (Gbl.F.Out,"</label>");
+      HTM_LABEL_End ();
       Frm_EndForm ();
       HTM_DIV_End ();
      }
@@ -7943,7 +7943,7 @@ void Usr_SeeStudents (void)
 	 fprintf (Gbl.F.Out,"<label class=\"%s\">%s:&nbsp;",
 		  The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Scope);
 	 Sco_PutSelectorScope ("ScopeUsr",true);
-	 fprintf (Gbl.F.Out,"</label>");
+	 HTM_LABEL_End ();
 	 Frm_EndForm ();
 	 HTM_DIV_End ();
 	 break;
@@ -8116,7 +8116,7 @@ void Usr_SeeTeachers (void)
    fprintf (Gbl.F.Out,"<label class=\"%s\">%s:&nbsp;",
 	    The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Scope);
    Sco_PutSelectorScope ("ScopeUsr",true);
-   fprintf (Gbl.F.Out,"</label>");
+   HTM_LABEL_End ();
    Frm_EndForm ();
    HTM_DIV_End ();
 
@@ -8357,10 +8357,10 @@ static void Usr_ShowOneListUsrsOption (Usr_ListUsrsOption_t ListUsrsAction,
       fprintf (Gbl.F.Out," checked=\"checked\"");
    fprintf (Gbl.F.Out," />"
 		      "<label for=\"ListUsrsAction%u\">"
-		      "%s"
-		      "</label>",
+		      "%s",
 	    (unsigned) ListUsrsAction,
             Label);
+   HTM_LABEL_End ();
 
    HTM_LI_End ();
   }
@@ -8975,8 +8975,9 @@ void Usr_PutSelectorNumColsClassPhoto (void)
 
    /***** End selector *****/
    fprintf (Gbl.F.Out,"</select>"
-	              "%s</label>",
+	              "%s",
             Txt_columns);
+   HTM_LABEL_End ();
   }
 
 /*****************************************************************************/