From 70ddefb9039c7138bde469099f55750148bc6fd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= <acanas@ugr.es>
Date: Wed, 20 Nov 2019 10:17:42 +0100
Subject: [PATCH] Version19.74

---
 css/{swad19.73.css => swad19.74.css} | 34 +++++-----
 swad_HTML.c                          | 25 ++++++--
 swad_HTML.h                          |  3 +-
 swad_ID.c                            |  2 +-
 swad_MFU.c                           |  6 +-
 swad_agenda.c                        |  2 +-
 swad_assignment.c                    |  2 +-
 swad_attendance.c                    |  4 +-
 swad_button.c                        | 12 ++--
 swad_centre.c                        |  6 +-
 swad_changelog.h                     |  8 ++-
 swad_chat.c                          |  2 +-
 swad_classroom.c                     |  2 +-
 swad_connected.c                     | 10 +--
 swad_country.c                       |  8 +--
 swad_course.c                        | 20 +++---
 swad_date.c                          |  4 +-
 swad_degree.c                        |  4 +-
 swad_degree_type.c                   |  2 +-
 swad_department.c                    |  2 +-
 swad_enrolment.c                     |  2 +-
 swad_figure.c                        |  2 +-
 swad_file_browser.c                  | 18 +++---
 swad_follow.c                        | 10 +--
 swad_forum.c                         |  4 +-
 swad_game.c                          |  6 +-
 swad_hierarchy.c                     | 18 +++---
 swad_holiday.c                       |  2 +-
 swad_info.c                          |  2 +-
 swad_institution.c                   |  8 +--
 swad_layout.c                        |  6 +-
 swad_link.c                          |  2 +-
 swad_mail.c                          |  2 +-
 swad_menu.c                          | 12 +---
 swad_message.c                       |  6 +-
 swad_notice.c                        |  2 +-
 swad_notification.c                  |  8 +--
 swad_pagination.c                    | 12 ++--
 swad_photo.c                         |  4 +-
 swad_place.c                         |  2 +-
 swad_profile.c                       |  4 +-
 swad_project.c                       |  4 +-
 swad_record.c                        |  8 +--
 swad_statistic.c                     |  6 +-
 swad_survey.c                        |  4 +-
 swad_tab.c                           |  2 +-
 swad_test.c                          |  2 +-
 swad_timeline.c                      | 95 +++++++++-------------------
 swad_user.c                          |  6 +-
 49 files changed, 196 insertions(+), 221 deletions(-)
 rename css/{swad19.73.css => swad19.74.css} (98%)

diff --git a/css/swad19.73.css b/css/swad19.74.css
similarity index 98%
rename from css/swad19.73.css
rename to css/swad19.74.css
index 1f97a925..ee5982cc 100644
--- a/css/swad19.73.css
+++ b/css/swad19.74.css
@@ -90,10 +90,6 @@ a:hover						/* Default ==> underlined */
 	{
 	text-decoration:underline;
 	}
-.TAB_OFF a, .TAB_ON a, .MENU_LIST_ITEM a, .CONTEXT_OPT a	/* Tabs and menus are the exceptions */
-	{
-	text-decoration:none;
-	}
 
 /****************** Layout (the whole page with a background) ****************/
 #whole_page
@@ -1497,6 +1493,7 @@ a:hover						/* Default ==> underlined */
 	
 .BT_LINK
 	{
+	display:inline;
 	background:none;
 	border:none;
 	padding:0;
@@ -1505,6 +1502,7 @@ a:hover						/* Default ==> underlined */
 .BT_LINK:hover
 	{
 	cursor:pointer;
+	text-decoration:underline;
 	}
 
 /********************************** Notice ***********************************/
@@ -1710,22 +1708,22 @@ a:hover						/* Default ==> underlined */
 	}
 
 /*********************************** Icons ***********************************/
-.ICOx16			{	     height:16px; vertical-align:middle;}
-.ICO16x16		{width:16px; height:16px; vertical-align:middle;}
-.ICO20x20		{width:20px; height:20px; vertical-align:middle;}
-.ICOx20			{	     height:20px; vertical-align:middle; margin:0 auto;}
-.ICO25x25		{width:25px; height:25px; vertical-align:middle;}
-.ICO40x40		{width:40px; height:40px; vertical-align:middle;}
-.ICO64x64		{width:64px; height:64px; vertical-align:middle;}
+.ICOx16		{	     height:16px; vertical-align:middle;}
+.ICO16x16	{width:16px; height:16px; vertical-align:middle;}
+.ICO20x20	{width:20px; height:20px; vertical-align:middle;}
+.ICOx20		{	     height:20px; vertical-align:middle; margin:0 auto;}
+.ICO25x25	{width:25px; height:25px; vertical-align:middle;}
+.ICO40x40	{width:40px; height:40px; vertical-align:middle;}
+.ICO64x64	{width:64px; height:64px; vertical-align:middle;}
 
-.ICO80x40		{width:80px; height:40px; vertical-align:middle;}
-.ICO140x40		{width:140px; height:40px; vertical-align:middle;}
-.ICO212x40		{width:212px; height:40px; vertical-align:middle;}
-.ICO220x40		{width:220px; height:40px; vertical-align:middle;}
-.ICO265x40		{width:265px; height:40px; vertical-align:middle;}
+.ICO80x40	{width:80px; height:40px; vertical-align:middle;}
+.ICO140x40	{width:140px; height:40px; vertical-align:middle;}
+.ICO212x40	{width:212px; height:40px; vertical-align:middle;}
+.ICO220x40	{width:220px; height:40px; vertical-align:middle;}
+.ICO265x40	{width:265px; height:40px; vertical-align:middle;}
 
-.ICO160x160		{width:160px; height:160px; vertical-align:middle;}
-.BANNER			{width:150px; height:50px;}
+.ICO160x160	{width:160px; height:160px; vertical-align:middle;}
+.BANNER		{width:150px; height:50px;}
 .BANNER_SMALL	{width:75px; height:25px;}
 
 /****** Contextual links with small icons and text to go to some action ******/
diff --git a/swad_HTML.c b/swad_HTML.c
index 0b02358b..9d17d809 100644
--- a/swad_HTML.c
+++ b/swad_HTML.c
@@ -1300,7 +1300,7 @@ void HTM_BUTTON_OnMouseDown_Begin (const char *Class)
    HTM_BUTTON_NestingLevel++;
   }
 
-void HTM_BUTTON_Begin (const char *Title,const char *Class,const char *OnSubmit)
+void HTM_BUTTON_SUBMIT_Begin (const char *Title,const char *Class,const char *OnSubmit)
   {
    fprintf (Gbl.F.Out,"<button type=\"submit\"");
    if (Title)
@@ -1309,8 +1309,7 @@ void HTM_BUTTON_Begin (const char *Title,const char *Class,const char *OnSubmit)
    if (Class)
       if (Class[0])
          HTM_TxtF (" class=\"%s\"",Class);
-   if (OnSubmit)	// JavaScript function to be called
-			// before submitting the form
+   if (OnSubmit)	// JavaScript function to be called before submitting the form
       if (OnSubmit[0])
          HTM_TxtF ("onsubmit=\"%s;\"",OnSubmit);
    fprintf (Gbl.F.Out,">");
@@ -1318,6 +1317,23 @@ void HTM_BUTTON_Begin (const char *Title,const char *Class,const char *OnSubmit)
    HTM_BUTTON_NestingLevel++;
   }
 
+void HTM_BUTTON_BUTTON_Begin (const char *Title,const char *Class,const char *OnClick)
+  {
+   fprintf (Gbl.F.Out,"<button type=\"button\"");
+   if (Title)
+      if (Title[0])
+         HTM_TxtF (" title=\"%s\"",Title);
+   if (Class)
+      if (Class[0])
+         HTM_TxtF (" class=\"%s\"",Class);
+   if (OnClick)	// JavaScript function to be called when clicking the button
+      if (OnClick[0])
+         HTM_TxtF ("onclick=\"%s;\"",OnClick);
+   fprintf (Gbl.F.Out,">");
+
+   HTM_BUTTON_NestingLevel++;
+  }
+
 void HTM_BUTTON_Animated_Begin (const char *Title,const char *Class,const char *OnClick)
   {
    fprintf (Gbl.F.Out,"<button type=\"submit\"");
@@ -1328,8 +1344,7 @@ void HTM_BUTTON_Animated_Begin (const char *Title,const char *Class,const char *
       if (Class[0])
          HTM_TxtF (" class=\"%s\"",Class);
    HTM_Txt (" onclick=\"");
-   if (OnClick)	// JavaScript function to be called
-		// before submitting the form
+   if (OnClick)	// JavaScript function to be called before when clicking the button
       if (OnClick[0])
          HTM_TxtF ("%s",OnClick);
    HTM_TxtF ("AnimateIcon(%d);\">",Gbl.Form.Num);
diff --git a/swad_HTML.h b/swad_HTML.h
index 1080a030..9b0400b6 100644
--- a/swad_HTML.h
+++ b/swad_HTML.h
@@ -135,7 +135,8 @@ void HTM_INPUT_CHECKBOX (const char *Name,bool SubmitOnChange,
 		         const char *fmt,...);
 
 void HTM_BUTTON_OnMouseDown_Begin (const char *Class);
-void HTM_BUTTON_Begin (const char *Title,const char *Class,const char *OnSubmit);
+void HTM_BUTTON_SUBMIT_Begin (const char *Title,const char *Class,const char *OnSubmit);
+void HTM_BUTTON_BUTTON_Begin (const char *Title,const char *Class,const char *OnClick);
 void HTM_BUTTON_Animated_Begin (const char *Title,const char *Class,const char *OnClick);
 void HTM_BUTTON_End (void);
 
diff --git a/swad_ID.c b/swad_ID.c
index 37467fad..c713a319 100644
--- a/swad_ID.c
+++ b/swad_ID.c
@@ -493,7 +493,7 @@ static void ID_PutLinkToConfirmID (struct UsrData *UsrDat,unsigned NumID,
    Par_PutHiddenParamString (NULL,"UsrID",UsrDat->IDs.List[NumID].ID);
 
    /***** Put link *****/
-   HTM_BUTTON_Begin (Txt_Confirm_ID,The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme],NULL);
+   HTM_BUTTON_SUBMIT_Begin (Txt_Confirm_ID,The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme],NULL);
    Ico_PutIconTextLink ("check.svg",Txt_Confirm_ID);
    HTM_BUTTON_End ();
 
diff --git a/swad_MFU.c b/swad_MFU.c
index 07db55ad..0b7ce51c 100644
--- a/swad_MFU.c
+++ b/swad_MFU.c
@@ -245,7 +245,7 @@ void MFU_WriteBigMFUActions (struct MFU_ListMFUActions *ListMFUActions)
          /* Icon and text */
          HTM_LI_Begin ("class=\"ICO_HIGHLIGHT\"");
          Frm_StartForm (Action);
-         HTM_BUTTON_Begin (TabMenuStr,The_ClassFormLinkInBoxNoWrap[Gbl.Prefs.Theme],NULL);
+         HTM_BUTTON_SUBMIT_Begin (TabMenuStr,The_ClassFormLinkInBoxNoWrap[Gbl.Prefs.Theme],NULL);
          HTM_IMG (Gbl.Prefs.URLIconSet,Act_GetIcon (Action),MenuStr,
 	          NULL);
          HTM_TxtF ("&nbsp;%s",TabMenuStr);
@@ -279,7 +279,7 @@ void MFU_WriteSmallMFUActions (struct MFU_ListMFUActions *ListMFUActions)
    /***** Start div and link *****/
    HTM_DIV_Begin ("id=\"MFU_actions\"");
    Frm_StartForm (ActMFUAct);
-   HTM_BUTTON_Begin (Txt_My_frequent_actions,"BT_LINK MFU_TITLE",NULL);
+   HTM_BUTTON_SUBMIT_Begin (Txt_My_frequent_actions,"BT_LINK MFU_TITLE",NULL);
    HTM_TxtF ("%s",Txt_Frequent_ACTIONS);
    HTM_BUTTON_End ();
    Frm_EndForm ();
@@ -306,7 +306,7 @@ void MFU_WriteSmallMFUActions (struct MFU_ListMFUActions *ListMFUActions)
          /* Icon and text */
          HTM_LI_Begin ("class=\"ICO_HIGHLIGHT\"");
          Frm_StartForm (Action);
-         HTM_BUTTON_Begin (TabMenuStr,"BT_LINK",NULL);
+         HTM_BUTTON_SUBMIT_Begin (TabMenuStr,"BT_LINK",NULL);
          HTM_IMG (Gbl.Prefs.URLIconSet,Act_GetIcon (Action),MenuStr,
 	          NULL);
 	 HTM_TxtF ("&nbsp;%s",MenuStr);
diff --git a/swad_agenda.c b/swad_agenda.c
index 888dc26d..da1e4d6a 100644
--- a/swad_agenda.c
+++ b/swad_agenda.c
@@ -597,7 +597,7 @@ static void Agd_WriteHeaderListEvents (Agd_AgendaType_t AgendaType)
 		             Gbl.Agenda.CurrentPage,
 		             -1L);
 
-      HTM_BUTTON_Begin (Txt_START_END_TIME_HELP[Order],"BT_LINK TIT_TBL",NULL);
+      HTM_BUTTON_SUBMIT_Begin (Txt_START_END_TIME_HELP[Order],"BT_LINK TIT_TBL",NULL);
       if (Order == Gbl.Agenda.SelectedOrder)
 	 HTM_U_Begin ();
       HTM_Txt (Txt_START_END_TIME[Order]);
diff --git a/swad_assignment.c b/swad_assignment.c
index f088ef3d..098972e8 100644
--- a/swad_assignment.c
+++ b/swad_assignment.c
@@ -219,7 +219,7 @@ static void Asg_PutHeadForSeeing (bool PrintView)
 	 Grp_PutParamWhichGrps ();
 	 Pag_PutHiddenParamPagNum (Pag_ASSIGNMENTS,Gbl.Asgs.CurrentPage);
 	 Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
-	 HTM_BUTTON_Begin (Txt_START_END_TIME_HELP[Order],"BT_LINK TIT_TBL",NULL);
+	 HTM_BUTTON_SUBMIT_Begin (Txt_START_END_TIME_HELP[Order],"BT_LINK TIT_TBL",NULL);
 	 if (Order == Gbl.Asgs.SelectedOrder)
 	    HTM_U_Begin ();
 	}
diff --git a/swad_attendance.c b/swad_attendance.c
index 5633d618..d163261f 100644
--- a/swad_attendance.c
+++ b/swad_attendance.c
@@ -257,7 +257,7 @@ static void Att_ShowAllAttEvents (void)
 	 Grp_PutParamWhichGrps ();
 	 Pag_PutHiddenParamPagNum (Pag_ATT_EVENTS,Gbl.AttEvents.CurrentPage);
 	 Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
-	 HTM_BUTTON_Begin (Txt_START_END_TIME_HELP[Order],"BT_LINK TIT_TBL",NULL);
+	 HTM_BUTTON_SUBMIT_Begin (Txt_START_END_TIME_HELP[Order],"BT_LINK TIT_TBL",NULL);
 	 if (Order == Gbl.AttEvents.SelectedOrder)
 	    HTM_U_Begin ();
 	 HTM_Txt (Txt_START_END_TIME[Order]);
@@ -2176,7 +2176,7 @@ static void Att_PutLinkAttEvent (struct AttendanceEvent *AttEvent,
    Frm_StartForm (ActSeeOneAtt);
    Att_PutParamAttCod (AttEvent->AttCod);
    Att_PutParamsCodGrps (AttEvent->AttCod);
-   HTM_BUTTON_Begin (Title,Class,NULL);
+   HTM_BUTTON_SUBMIT_Begin (Title,Class,NULL);
    HTM_Txt (Txt);
    HTM_BUTTON_End ();
    Frm_EndForm ();
diff --git a/swad_button.c b/swad_button.c
index cec4eb52..1efb8c8b 100644
--- a/swad_button.c
+++ b/swad_button.c
@@ -100,7 +100,7 @@ void Btn_PutButtonInline (Btn_Button_t Button,const char *TxtButton)
 void Btn_PutCreateButton (const char *TxtButton)
   {
    HTM_DIV_Begin ("class=\"CM\"");
-   HTM_BUTTON_Begin (NULL,"BT_SUBMIT BT_CREATE",NULL);
+   HTM_BUTTON_SUBMIT_Begin (NULL,"BT_SUBMIT BT_CREATE",NULL);
    HTM_Txt (TxtButton);
    HTM_BUTTON_End ();
    HTM_DIV_End ();
@@ -108,7 +108,7 @@ void Btn_PutCreateButton (const char *TxtButton)
 
 void Btn_PutCreateButtonInline (const char *TxtButton)
   {
-   HTM_BUTTON_Begin (NULL,"BT_SUBMIT_INLINE BT_CREATE",NULL);
+   HTM_BUTTON_SUBMIT_Begin (NULL,"BT_SUBMIT_INLINE BT_CREATE",NULL);
    HTM_Txt (TxtButton);
    HTM_BUTTON_End ();
   }
@@ -116,7 +116,7 @@ void Btn_PutCreateButtonInline (const char *TxtButton)
 void Btn_PutConfirmButton (const char *TxtButton)
   {
    HTM_DIV_Begin ("class=\"CM\"");
-   HTM_BUTTON_Begin (NULL,"BT_SUBMIT BT_CONFIRM",NULL);
+   HTM_BUTTON_SUBMIT_Begin (NULL,"BT_SUBMIT BT_CONFIRM",NULL);
    HTM_Txt (TxtButton);
    HTM_BUTTON_End ();
    HTM_DIV_End ();
@@ -124,7 +124,7 @@ void Btn_PutConfirmButton (const char *TxtButton)
 
 void Btn_PutConfirmButtonInline (const char *TxtButton)
   {
-   HTM_BUTTON_Begin (NULL,"BT_SUBMIT_INLINE BT_CONFIRM",NULL);
+   HTM_BUTTON_SUBMIT_Begin (NULL,"BT_SUBMIT_INLINE BT_CONFIRM",NULL);
    HTM_Txt (TxtButton);
    HTM_BUTTON_End ();
   }
@@ -132,7 +132,7 @@ void Btn_PutConfirmButtonInline (const char *TxtButton)
 void Btn_PutRemoveButton (const char *TxtButton)
   {
    HTM_DIV_Begin ("class=\"CM\"");
-   HTM_BUTTON_Begin (NULL,"BT_SUBMIT BT_REMOVE",NULL);
+   HTM_BUTTON_SUBMIT_Begin (NULL,"BT_SUBMIT BT_REMOVE",NULL);
    HTM_Txt (TxtButton);
    HTM_BUTTON_End ();
    HTM_DIV_End ();
@@ -140,7 +140,7 @@ void Btn_PutRemoveButton (const char *TxtButton)
 
 void Btn_PutRemoveButtonInline (const char *TxtButton)
   {
-   HTM_BUTTON_Begin (NULL,"BT_SUBMIT_INLINE BT_REMOVE",NULL);
+   HTM_BUTTON_SUBMIT_Begin (NULL,"BT_SUBMIT_INLINE BT_REMOVE",NULL);
    HTM_Txt (TxtButton);
    HTM_BUTTON_End ();
   }
diff --git a/swad_centre.c b/swad_centre.c
index 7c01c620..066e263a 100644
--- a/swad_centre.c
+++ b/swad_centre.c
@@ -249,7 +249,7 @@ void Ctr_DrawCentreLogoAndNameWithLink (struct Centre *Ctr,Act_Action_t Action,
    snprintf (Gbl.Title,sizeof (Gbl.Title),
 	     Txt_Go_to_X,
 	     Ctr->FullName);
-   HTM_BUTTON_Begin (Gbl.Title,ClassLink,NULL);
+   HTM_BUTTON_SUBMIT_Begin (Gbl.Title,ClassLink,NULL);
 
    /***** Centre logo and name *****/
    Log_DrawLogo (Hie_CTR,Ctr->CtrCod,Ctr->ShrtName,16,ClassLogo,true);
@@ -645,7 +645,7 @@ static void Ctr_Configuration (bool PrintView)
       snprintf (Gbl.Title,sizeof (Gbl.Title),
 		Txt_Degrees_of_CENTRE_X,
 		Gbl.Hierarchy.Ctr.ShrtName);
-      HTM_BUTTON_Begin (Gbl.Title,"BT_LINK DAT",NULL);
+      HTM_BUTTON_SUBMIT_Begin (Gbl.Title,"BT_LINK DAT",NULL);
       HTM_Unsigned (Deg_GetNumDegsInCtr (Gbl.Hierarchy.Ctr.CtrCod));
       HTM_BUTTON_End ();
       Frm_EndForm ();
@@ -2586,7 +2586,7 @@ static void Ctr_PutHeadCentresForSeeing (bool OrderSelectable)
 	{
 	 Frm_StartForm (ActSeeCtr);
 	 Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
-	 HTM_BUTTON_Begin (Txt_CENTRES_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
+	 HTM_BUTTON_SUBMIT_Begin (Txt_CENTRES_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
 	 if (Order == Gbl.Hierarchy.Ins.Ctrs.SelectedOrder)
 	    HTM_U_Begin ();
 	}
diff --git a/swad_changelog.h b/swad_changelog.h
index 8cd1bb2f..b3adc434 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -488,14 +488,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.73.1 (2019-11-19)"
-#define CSS_FILE		"swad19.73.css"
+#define Log_PLATFORM_VERSION	"SWAD 19.74 (2019-11-20)"
+#define CSS_FILE		"swad19.74.css"
 #define JS_FILE			"swad19.70.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.
 
-	Version 19.73.1:  Nov 19, 2019	Code refactoring in notifications. (? lines)
+	Version 19.74:    Nov 20, 2019	Changes in CSS.
+					Changes in layout of timeline. (247031 lines)
+	Version 19.73.1:  Nov 19, 2019	Code refactoring in notifications. (247047 lines)
 	Version 19.73:    Nov 18, 2019	Changes in file browser. (247005 lines)
 	Version 19.72.2:  Nov 18, 2019	Fixed bugs related to buttons. (247024 lines)
 	Version 19.72.1:  Nov 18, 2019	Fixed bugs related to buttons. (247023 lines)
diff --git a/swad_chat.c b/swad_chat.c
index 56e27f2c..703b33ff 100644
--- a/swad_chat.c
+++ b/swad_chat.c
@@ -311,7 +311,7 @@ static void Cht_WriteLinkToChat1 (const char *RoomCode,const char *RoomShrtName,
    Frm_StartForm (ActCht);
    Cht_WriteParamsRoomCodeAndNames (RoomCode,RoomShrtName,RoomFullName);
 
-   HTM_BUTTON_Begin (RoomFullName,The_ClassFormLinkInBox[Gbl.Prefs.Theme],NULL);
+   HTM_BUTTON_SUBMIT_Begin (RoomFullName,The_ClassFormLinkInBox[Gbl.Prefs.Theme],NULL);
   }
 
 static void Cht_WriteLinkToChat2 (const char *RoomCode,const char *RoomFullName)
diff --git a/swad_classroom.c b/swad_classroom.c
index 18a58113..1697cabb 100644
--- a/swad_classroom.c
+++ b/swad_classroom.c
@@ -124,7 +124,7 @@ void Cla_SeeClassrooms (void)
       HTM_TH_Begin (1,1,"LM");
       Frm_StartForm (ActSeeCla);
       Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
-      HTM_BUTTON_Begin (Txt_CLASSROOMS_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
+      HTM_BUTTON_SUBMIT_Begin (Txt_CLASSROOMS_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
       if (Order == Gbl.Classrooms.SelectedOrder)
 	 HTM_U_Begin ();
       HTM_Txt (Txt_CLASSROOMS_ORDER[Order]);
diff --git a/swad_connected.c b/swad_connected.c
index b523b7ab..eb562128 100644
--- a/swad_connected.c
+++ b/swad_connected.c
@@ -166,7 +166,7 @@ void Con_ShowGlobalConnectedUsrs (void)
    Frm_StartFormUnique (ActLstCon);	// Must be unique because
 					// the list of connected users
 					// is dynamically updated via AJAX
-   HTM_BUTTON_Begin (Txt_Connected_users,"BT_LINK CONNECTED_TXT",NULL);
+   HTM_BUTTON_SUBMIT_Begin (Txt_Connected_users,"BT_LINK CONNECTED_TXT",NULL);
 
    /* Write total number of sessions */
    HTM_TxtF ("%u&nbsp;%s",Gbl.Session.NumSessions,
@@ -314,7 +314,7 @@ void Con_ShowConnectedUsrsBelongingToCurrentCrs (void)
    Frm_StartFormUnique (ActLstCon);	// Must be unique because
 					// the list of connected users
 					// is dynamically updated via AJAX
-   HTM_BUTTON_Begin (Txt_Connected_users,"BT_LINK CONNECTED_TXT",NULL);
+   HTM_BUTTON_SUBMIT_Begin (Txt_Connected_users,"BT_LINK CONNECTED_TXT",NULL);
    Str_Copy (CourseName,Gbl.Hierarchy.Crs.ShrtName,
              Hie_MAX_BYTES_SHRT_NAME);
    Con_GetNumConnectedUsrsWithARoleBelongingCurrentLocation (Rol_UNK,&Usrs);
@@ -406,7 +406,7 @@ static void Con_ShowConnectedUsrsWithARoleBelongingToCurrentCrsOnRightColumn (Ro
 						// the list of connected users
 						// is dynamically updated via AJAX
 	 Sco_PutParamScope ("ScopeCon",Hie_CRS);
-	 HTM_BUTTON_Begin (Txt_Connected_users,"CONNECTED_TXT",NULL);
+	 HTM_BUTTON_SUBMIT_Begin (Txt_Connected_users,"CONNECTED_TXT",NULL);
 	 Ico_PutIcon ("ellipsis-h.svg",Txt_Connected_users,"ICO16x16");
 	 HTM_BUTTON_End ();
 	 Frm_EndForm ();
@@ -849,7 +849,7 @@ static void Con_WriteRowConnectedUsrOnRightColumn (Rol_Role_t Role)
    Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
 
    HTM_DIV_Begin ("class=\"CON_NAME_NARROW\"");	// Limited width
-   HTM_BUTTON_Begin (Txt_View_record_for_this_course,ClassLink,NULL);
+   HTM_BUTTON_SUBMIT_Begin (Txt_View_record_for_this_course,ClassLink,NULL);
    Usr_WriteFirstNameBRSurnames (UsrDat);
    HTM_BUTTON_End ();
    HTM_DIV_End ();
@@ -1075,7 +1075,7 @@ static void Con_ShowConnectedUsrsCurrentLocationOneByOneOnMainZone (Rol_Role_t R
 
             HTM_DIV_Begin ("class=\"CON_NAME_WIDE\"");	// Limited width
 	    if (PutLinkToRecord)
-	       HTM_BUTTON_Begin (UsrDat.FullName,ClassLink,NULL);
+	       HTM_BUTTON_SUBMIT_Begin (UsrDat.FullName,ClassLink,NULL);
             Usr_WriteFirstNameBRSurnames (&UsrDat);
 	    if (PutLinkToRecord)
 	       HTM_BUTTON_End ();
diff --git a/swad_country.c b/swad_country.c
index 0b30ccc9..772aafb7 100644
--- a/swad_country.c
+++ b/swad_country.c
@@ -402,7 +402,7 @@ static void Cty_Configuration (bool PrintView)
       snprintf (Gbl.Title,sizeof (Gbl.Title),
 		Txt_Institutions_of_COUNTRY_X,
 		Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]);
-      HTM_BUTTON_Begin (Gbl.Title,"BT_LINK DAT",NULL);
+      HTM_BUTTON_SUBMIT_Begin (Gbl.Title,"BT_LINK DAT",NULL);
       HTM_Unsigned (Ins_GetNumInssInCty (Gbl.Hierarchy.Cty.CtyCod));
       HTM_BUTTON_End ();
       Frm_EndForm ();
@@ -664,7 +664,7 @@ static void Cty_PutHeadCountriesForSeeing (bool OrderSelectable)
 	{
 	 Frm_StartForm (ActSeeCty);
 	 Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
-	 HTM_BUTTON_Begin (Txt_COUNTRIES_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
+	 HTM_BUTTON_SUBMIT_Begin (Txt_COUNTRIES_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
 	 if (Order == Gbl.Hierarchy.Sys.Ctys.SelectedOrder)
 	    HTM_U_Begin ();
 	}
@@ -817,7 +817,7 @@ void Cty_DrawCountryMapAndNameWithLink (struct Country *Cty,Act_Action_t Action,
    snprintf (Gbl.Title,sizeof (Gbl.Title),
 	     Txt_Go_to_X,
 	     Cty->Name[Gbl.Prefs.Language]);
-   HTM_BUTTON_Begin (Gbl.Title,ClassLink,NULL);
+   HTM_BUTTON_SUBMIT_Begin (Gbl.Title,ClassLink,NULL);
 
    /***** Draw country map *****/
    Cty_DrawCountryMap (Cty,ClassMap);
@@ -1289,7 +1289,7 @@ void Cty_WriteCountryName (long CtyCod,const char *ClassLink)
       /***** Write country name with link to country information *****/
       Frm_StartForm (ActSeeCtyInf);
       Cty_PutParamCtyCod (CtyCod);
-      HTM_BUTTON_Begin (Act_GetActionTextFromDB (Act_GetActCod (ActSeeCtyInf),ActTxt),
+      HTM_BUTTON_SUBMIT_Begin (Act_GetActionTextFromDB (Act_GetActCod (ActSeeCtyInf),ActTxt),
 		        ClassLink,NULL);
       HTM_Txt (CtyName);
       HTM_BUTTON_End ();
diff --git a/swad_course.c b/swad_course.c
index 37acb548..6442aca1 100644
--- a/swad_course.c
+++ b/swad_course.c
@@ -460,7 +460,7 @@ static void Crs_Configuration (bool PrintView)
 	        "%u %s %u",
                 Indicators.NumIndicators,
 		Txt_of_PART_OF_A_TOTAL,Ind_NUM_INDICATORS);
-      HTM_BUTTON_Begin (Gbl.Title,"BT_LINK DAT",NULL);
+      HTM_BUTTON_SUBMIT_Begin (Gbl.Title,"BT_LINK DAT",NULL);
       HTM_TxtF ("%s&nbsp;",Gbl.Title);
       Ico_PutIcon ((Indicators.NumIndicators == Ind_NUM_INDICATORS) ? "check-circle.svg" :
         	                                                      "exclamation-triangle.svg",
@@ -567,7 +567,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
 			                    ClassNormal);
    Frm_StartForm (ActMyCrs);
    Cty_PutParamCtyCod (-1L);
-   HTM_BUTTON_Begin (Txt_System,
+   HTM_BUTTON_SUBMIT_Begin (Txt_System,
                      Highlight ? ClassHighlight :
         	                 ClassNormal,
 		     NULL);
@@ -600,7 +600,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
       Lay_IndentDependingOnLevel (1,IsLastItemInLevel);
       Frm_StartForm (ActMyCrs);
       Cty_PutParamCtyCod (Cty.CtyCod);
-      HTM_BUTTON_Begin (Act_GetActionTextFromDB (Act_GetActCod (ActSeeCtyInf),ActTxt),
+      HTM_BUTTON_SUBMIT_Begin (Act_GetActionTextFromDB (Act_GetActCod (ActSeeCtyInf),ActTxt),
 			Highlight ? ClassHighlight :
         	                    ClassNormal,
 		        NULL);
@@ -634,7 +634,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
 	 Lay_IndentDependingOnLevel (2,IsLastItemInLevel);
          Frm_StartForm (ActMyCrs);
 	 Ins_PutParamInsCod (Ins.InsCod);
-	 HTM_BUTTON_Begin (Act_GetActionTextFromDB (Act_GetActCod (ActSeeInsInf),ActTxt),
+	 HTM_BUTTON_SUBMIT_Begin (Act_GetActionTextFromDB (Act_GetActCod (ActSeeInsInf),ActTxt),
 	                   Highlight ? ClassHighlight :
         	                       ClassNormal,
 			   NULL);
@@ -668,7 +668,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
 	    Lay_IndentDependingOnLevel (3,IsLastItemInLevel);
             Frm_StartForm (ActMyCrs);
 	    Ctr_PutParamCtrCod (Ctr.CtrCod);
-	    HTM_BUTTON_Begin (Act_GetActionTextFromDB (Act_GetActCod (ActSeeCtrInf),ActTxt),
+	    HTM_BUTTON_SUBMIT_Begin (Act_GetActionTextFromDB (Act_GetActCod (ActSeeCtrInf),ActTxt),
 	                      Highlight ? ClassHighlight :
         	                          ClassNormal,
 			      NULL);
@@ -702,7 +702,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
 	       Lay_IndentDependingOnLevel (4,IsLastItemInLevel);
                Frm_StartForm (ActMyCrs);
 	       Deg_PutParamDegCod (Deg.DegCod);
-	       HTM_BUTTON_Begin (Act_GetActionTextFromDB (Act_GetActCod (ActSeeDegInf),ActTxt),
+	       HTM_BUTTON_SUBMIT_Begin (Act_GetActionTextFromDB (Act_GetActCod (ActSeeDegInf),ActTxt),
 	                         Highlight ? ClassHighlight :
         	                             ClassNormal,
 			         NULL);
@@ -739,7 +739,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
 		  snprintf (Gbl.Title,sizeof (Gbl.Title),
 			    Txt_Go_to_X,
 			    Crs.ShrtName);
-		  HTM_BUTTON_Begin (Gbl.Title,
+		  HTM_BUTTON_SUBMIT_Begin (Gbl.Title,
 		                    Highlight ? ClassHighlight :
         	                                ClassNormal,
 				    NULL);
@@ -1262,7 +1262,7 @@ static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year)
 	 snprintf (Gbl.Title,sizeof (Gbl.Title),
 	           Txt_Go_to_X,
 		   Crs->FullName);
-	 HTM_BUTTON_Begin (Gbl.Title,TxtClassStrong,NULL);
+	 HTM_BUTTON_SUBMIT_Begin (Gbl.Title,TxtClassStrong,NULL);
 	 HTM_Txt (Crs->FullName);
 	 HTM_BUTTON_End ();
 	 Frm_EndForm ();
@@ -3182,7 +3182,7 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA
    snprintf (Gbl.Title,sizeof (Gbl.Title),
 	     Txt_Go_to_X,
 	     row[2]);
-   HTM_BUTTON_Begin (Gbl.Title,ClassLink,NULL);
+   HTM_BUTTON_SUBMIT_Begin (Gbl.Title,ClassLink,NULL);
    Log_DrawLogo (Hie_DEG,Deg.DegCod,Deg.ShrtName,20,"CT",true);
    HTM_TxtF ("&nbsp;%s&nbsp;(%s)",row[2],row[6]);
    HTM_BUTTON_End ();
@@ -3201,7 +3201,7 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA
    snprintf (Gbl.Title,sizeof (Gbl.Title),
 	     Txt_Go_to_X,
 	     row[5]);
-   HTM_BUTTON_Begin (Gbl.Title,ClassLink,NULL);
+   HTM_BUTTON_SUBMIT_Begin (Gbl.Title,ClassLink,NULL);
    HTM_Txt (row[5]);
    HTM_BUTTON_End ();
    Frm_EndForm ();
diff --git a/swad_date.c b/swad_date.c
index e77c3189..46e2c53a 100644
--- a/swad_date.c
+++ b/swad_date.c
@@ -317,7 +317,7 @@ void Dat_ShowClientLocalTime (void)
    /* Month with link to calendar */
    HTM_DIV_Begin ("id=\"current_month\"");
    Frm_StartForm (ActSeeCal);
-   HTM_BUTTON_Begin (Txt_Show_calendar,"BT_LINK CURRENT_MONTH",NULL);
+   HTM_BUTTON_SUBMIT_Begin (Txt_Show_calendar,"BT_LINK CURRENT_MONTH",NULL);
    HTM_SPAN_Begin ("id=\"current_month_txt\"");
    // JavaScript will write HTML here
    HTM_SPAN_End ();
@@ -330,7 +330,7 @@ void Dat_ShowClientLocalTime (void)
    if (Gbl.Usrs.Me.Logged)
      {
       Frm_StartForm (ActSeeMyAgd);
-      HTM_BUTTON_Begin (Txt_Show_agenda,"BT_LINK CURRENT_DAY",NULL);
+      HTM_BUTTON_SUBMIT_Begin (Txt_Show_agenda,"BT_LINK CURRENT_DAY",NULL);
      }
    HTM_SPAN_Begin ("id=\"current_day_txt\"");
    // JavaScript will write HTML here
diff --git a/swad_degree.c b/swad_degree.c
index 55011e29..7c155344 100644
--- a/swad_degree.c
+++ b/swad_degree.c
@@ -253,7 +253,7 @@ void Deg_DrawDegreeLogoAndNameWithLink (struct Degree *Deg,Act_Action_t Action,
    snprintf (Gbl.Title,sizeof (Gbl.Title),
 	     Txt_Go_to_X,
 	     Deg->FullName);
-   HTM_BUTTON_Begin (Gbl.Title,ClassLink,NULL);
+   HTM_BUTTON_SUBMIT_Begin (Gbl.Title,ClassLink,NULL);
 
    /***** Degree logo and name *****/
    Log_DrawLogo (Hie_DEG,Deg->DegCod,Deg->ShrtName,16,ClassLogo,true);
@@ -514,7 +514,7 @@ static void Deg_Configuration (bool PrintView)
       snprintf (Gbl.Title,sizeof (Gbl.Title),
 		Txt_Courses_of_DEGREE_X,
 		Gbl.Hierarchy.Deg.ShrtName);
-      HTM_BUTTON_Begin (Gbl.Title,"BT_LINK DAT",NULL);
+      HTM_BUTTON_SUBMIT_Begin (Gbl.Title,"BT_LINK DAT",NULL);
       HTM_Unsigned (Crs_GetNumCrssInDeg (Gbl.Hierarchy.Deg.DegCod));
       HTM_BUTTON_End ();
       Frm_EndForm ();
diff --git a/swad_degree_type.c b/swad_degree_type.c
index 4c2e66ca..2305c122 100644
--- a/swad_degree_type.c
+++ b/swad_degree_type.c
@@ -516,7 +516,7 @@ static void DT_PutHeadDegreeTypesForSeeing (Act_Action_t NextAction,DT_Order_t S
       Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
 
       /* Link with the head of this column */
-      HTM_BUTTON_Begin (Txt_DEGREE_TYPES_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
+      HTM_BUTTON_SUBMIT_Begin (Txt_DEGREE_TYPES_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
       if (Order == SelectedOrder)
 	 HTM_U_Begin ();
       HTM_Txt (Txt_DEGREE_TYPES_ORDER[Order]);
diff --git a/swad_department.c b/swad_department.c
index 51decec1..340c8e3d 100644
--- a/swad_department.c
+++ b/swad_department.c
@@ -129,7 +129,7 @@ void Dpt_SeeDepts (void)
 
       Frm_StartForm (ActSeeDpt);
       Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
-      HTM_BUTTON_Begin (Txt_DEPARTMENTS_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
+      HTM_BUTTON_SUBMIT_Begin (Txt_DEPARTMENTS_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
       if (Order == Gbl.Dpts.SelectedOrder)
 	 HTM_U_Begin ();
       HTM_Txt (Txt_DEPARTMENTS_ORDER[Order]);
diff --git a/swad_enrolment.c b/swad_enrolment.c
index 7d847488..b0619f39 100644
--- a/swad_enrolment.c
+++ b/swad_enrolment.c
@@ -2839,7 +2839,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
             snprintf (Gbl.Title,sizeof (Gbl.Title),
         	      Txt_Go_to_X,
 		      Crs.FullName);
-            HTM_BUTTON_Begin (Gbl.Title,"BT_LINK DAT",NULL);
+            HTM_BUTTON_SUBMIT_Begin (Gbl.Title,"BT_LINK DAT",NULL);
             HTM_TxtF ("%s &gt; %s",Deg.ShrtName,Crs.ShrtName);
             HTM_BUTTON_End ();
             HTM_TD_End ();
diff --git a/swad_figure.c b/swad_figure.c
index 706ce7e5..7d70a2c6 100644
--- a/swad_figure.c
+++ b/swad_figure.c
@@ -1473,7 +1473,7 @@ static void Fig_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss,
 	       /* Icon and name of this institution */
 	       Frm_StartForm (ActSeeInsInf);
 	       Ins_PutParamInsCod (Ins.InsCod);
-	       HTM_BUTTON_Begin (Ins.ShrtName,The_ClassFormLinkInBox[Gbl.Prefs.Theme],NULL);
+	       HTM_BUTTON_SUBMIT_Begin (Ins.ShrtName,The_ClassFormLinkInBox[Gbl.Prefs.Theme],NULL);
 	       if (Gbl.Usrs.Listing.WithPhotos)
 		 {
 		  Log_DrawLogo (Hie_INS,Ins.InsCod,Ins.ShrtName,
diff --git a/swad_file_browser.c b/swad_file_browser.c
index ee122d0d..efb9d1c5 100644
--- a/swad_file_browser.c
+++ b/swad_file_browser.c
@@ -3393,7 +3393,7 @@ static void Brw_ShowDataOwnerAsgWrk (struct UsrData *UsrDat)
    /***** Show user's name *****/
    HTM_BR ();
 
-   HTM_BUTTON_Begin (Txt_View_record_for_this_course,"BT_LINK AUTHOR_TXT",NULL);
+   HTM_BUTTON_SUBMIT_Begin (Txt_View_record_for_this_course,"BT_LINK AUTHOR_TXT",NULL);
    HTM_Txt (UsrDat->Surname1);
    if (UsrDat->Surname2[0])
       HTM_TxtF ("&nbsp;%s",UsrDat->Surname2);
@@ -6311,7 +6311,7 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic)
       /* Link to the form and to the file */
       if (asprintf (&Class,"BT_LINK FILENAME %s",Gbl.FileBrowser.TxtStyle) < 0)
 	 Lay_NotEnoughMemoryExit ();
-      HTM_BUTTON_Begin ((Gbl.FileBrowser.Type == Brw_SHOW_MRK_CRS ||
+      HTM_BUTTON_SUBMIT_Begin ((Gbl.FileBrowser.Type == Brw_SHOW_MRK_CRS ||
 	                 Gbl.FileBrowser.Type == Brw_SHOW_MRK_GRP) ? Txt_Check_marks_in_the_file :
 	                                                             Txt_Download,
 		        Class,NULL);
@@ -10024,7 +10024,7 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL,
       Brw_PutImplicitParamsFileBrowser ();
 
       /* Link begin */
-      HTM_BUTTON_Begin (Txt_Check_marks_in_the_file,"BT_LINK FILENAME_TXT",NULL);
+      HTM_BUTTON_SUBMIT_Begin (Txt_Check_marks_in_the_file,"BT_LINK FILENAME_TXT",NULL);
       Brw_PutIconFile (FileMetadata->FilFolLnk.Type,FileMetadata->FilFolLnk.Name,
 		       "ICO40x40",false);
 
@@ -10075,7 +10075,7 @@ static void Brw_WriteSmallLinkToDownloadFile (const char *URL,
       Brw_PutImplicitParamsFileBrowser ();
 
       /* Link begin */
-      HTM_BUTTON_Begin (Txt_Check_marks_in_the_file,"BT_LINK DAT",NULL);
+      HTM_BUTTON_SUBMIT_Begin (Txt_Check_marks_in_the_file,"BT_LINK DAT",NULL);
 
       /* Name of the file of marks */
       HTM_Txt (FileNameToShow);
@@ -11930,7 +11930,7 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row)
          snprintf (Gbl.Title,sizeof (Gbl.Title),
                    Txt_Go_to_X,
 		   InsShortName);
-         HTM_BUTTON_Begin (Gbl.Title,"BT_LINK LT DAT",NULL);
+         HTM_BUTTON_SUBMIT_Begin (Gbl.Title,"BT_LINK LT DAT",NULL);
          Log_DrawLogo (Hie_INS,InsCod,InsShortName,20,"BT_LINK LT",true);
 	 HTM_TxtF ("&nbsp;%s",InsShortName);
 	 HTM_BUTTON_End ();
@@ -11947,7 +11947,7 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row)
          snprintf (Gbl.Title,sizeof (Gbl.Title),
                    Txt_Go_to_X,
 		   CtrShortName);
-         HTM_BUTTON_Begin (Gbl.Title,"BT_LINK LT DAT",NULL);
+         HTM_BUTTON_SUBMIT_Begin (Gbl.Title,"BT_LINK LT DAT",NULL);
          Log_DrawLogo (Hie_CTR,CtrCod,CtrShortName,20,"LT",true);
 	 HTM_TxtF ("&nbsp;%s",CtrShortName);
 	 HTM_BUTTON_End ();
@@ -11964,7 +11964,7 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row)
          snprintf (Gbl.Title,sizeof (Gbl.Title),
                    Txt_Go_to_X,
 		   DegShortName);
-         HTM_BUTTON_Begin (Gbl.Title,"BT_LINK LT DAT",NULL);
+         HTM_BUTTON_SUBMIT_Begin (Gbl.Title,"BT_LINK LT DAT",NULL);
          Log_DrawLogo (Hie_DEG,DegCod,DegShortName,20,"LT",true);
 	 HTM_TxtF ("&nbsp;%s",DegShortName);
 	 HTM_BUTTON_End ();
@@ -11981,7 +11981,7 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row)
 	 snprintf (Gbl.Title,sizeof (Gbl.Title),
 	           Txt_Go_to_X,
 		   CrsShortName);
-	 HTM_BUTTON_Begin (Gbl.Title,"BT_LINK DAT",NULL);
+	 HTM_BUTTON_SUBMIT_Begin (Gbl.Title,"BT_LINK DAT",NULL);
 	 HTM_Txt (CrsShortName);
 	 HTM_BUTTON_End ();
 	 Frm_EndForm ();
@@ -12083,7 +12083,7 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row)
 				   FileMetadata.FilCod);
 
       /* File or folder icon */
-      HTM_BUTTON_Begin (FileNameToShow,"BT_LINK LT DAT_N",NULL);
+      HTM_BUTTON_SUBMIT_Begin (FileNameToShow,"BT_LINK LT DAT_N",NULL);
       if (FileMetadata.FilFolLnk.Type == Brw_IS_FOLDER)
 	 /* Icon with folder */
          Ico_PutIcon ("folder-yellow.png",Txt_Folder,"CONTEXT_ICO_16x16");
diff --git a/swad_follow.c b/swad_follow.c
index 3e5495c3..822bb246 100644
--- a/swad_follow.c
+++ b/swad_follow.c
@@ -213,7 +213,7 @@ void Fol_SuggestUsrsToFollowMainZoneOnRightColumn (void)
 
       /***** Title with link to suggest more users to follow *****/
       Frm_StartForm (ActSeeSocPrf);
-      HTM_BUTTON_Begin (Txt_Who_to_follow,"BT_LINK CONNECTED_TXT",NULL);
+      HTM_BUTTON_SUBMIT_Begin (Txt_Who_to_follow,"BT_LINK CONNECTED_TXT",NULL);
       HTM_Txt (Txt_Who_to_follow);
       HTM_BUTTON_End ();
       Frm_EndForm ();
@@ -596,7 +596,7 @@ static void Fol_ShowNumberOfFollowingOrFollowers (const struct UsrData *UsrDat,
       /* Form to list users */
       Frm_StartFormAnchor (Action,Fol_FOLLOW_SECTION_ID);
       Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
-      HTM_BUTTON_Begin (Title,
+      HTM_BUTTON_SUBMIT_Begin (Title,
                         (Gbl.Action.Act == Action) ? "BT_LINK FOLLOW_NUM_B" :
         	                                     "BT_LINK FOLLOW_NUM",
 			NULL);
@@ -622,7 +622,7 @@ static void Fol_ShowNumberOfFollowingOrFollowers (const struct UsrData *UsrDat,
       /* Form to list users */
       Frm_StartFormAnchor (Action,Fol_FOLLOW_SECTION_ID);
       Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
-      HTM_BUTTON_Begin (Title,
+      HTM_BUTTON_SUBMIT_Begin (Title,
                         (Gbl.Action.Act == Action) ? The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme] :
         	                                     The_ClassFormLinkOutBox    [Gbl.Prefs.Theme],
 			NULL);
@@ -842,7 +842,7 @@ static void Fol_ShowFollowedOrFollower (struct UsrData *UsrDat)
       Frm_StartForm (ActSeeOthPubPrf);
       Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
       HTM_DIV_Begin ("class=\"FOLLOW_USR_NAME\"");	// Limited width
-      HTM_BUTTON_Begin (Txt_Another_user_s_profile,"BT_LINK LT DAT",NULL);
+      HTM_BUTTON_SUBMIT_Begin (Txt_Another_user_s_profile,"BT_LINK LT DAT",NULL);
       Usr_WriteFirstNameBRSurnames (UsrDat);
       HTM_BUTTON_End ();
       HTM_DIV_End ();
@@ -899,7 +899,7 @@ static void Fol_WriteRowUsrToFollowOnRightColumn (struct UsrData *UsrDat)
       Frm_StartForm (ActSeeOthPubPrf);
       Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
       HTM_DIV_Begin ("class=\"CON_NAME_FOLLOW\"");	// Limited width
-      HTM_BUTTON_Begin (Txt_Another_user_s_profile,"BT_LINK CON_NAME_FOLLOW CON_CRS",NULL);
+      HTM_BUTTON_SUBMIT_Begin (Txt_Another_user_s_profile,"BT_LINK CON_NAME_FOLLOW CON_CRS",NULL);
       Usr_WriteFirstNameBRSurnames (UsrDat);
       HTM_BUTTON_End ();
       HTM_DIV_End ();
diff --git a/swad_forum.c b/swad_forum.c
index 2e7eaff7..66d79769 100644
--- a/swad_forum.c
+++ b/swad_forum.c
@@ -2065,7 +2065,7 @@ static void For_WriteLinkToForum (struct Forum *Forum,
                                 Forum->Location,
                                 -1L,
                                 -1L);
-   HTM_BUTTON_Begin (Act_GetActionTextFromDB (Act_GetActCod (For_ActionsSeeFor[Forum->Type]),ActTxt),
+   HTM_BUTTON_SUBMIT_Begin (Act_GetActionTextFromDB (Act_GetActCod (For_ActionsSeeFor[Forum->Type]),ActTxt),
                      Class,NULL);
    For_SetForumName (Forum,ForumName,Gbl.Prefs.Language,true);
    switch (Forum->Type)
@@ -2498,7 +2498,7 @@ static void For_ShowForumThreadsHighlightingOneThread (long ThrCodHighlighted,
 				      Gbl.Forum.ForumSelected.Location,
 				      -1L,
 				      -1L);
-	 HTM_BUTTON_Begin (Txt_FORUM_THREAD_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
+	 HTM_BUTTON_SUBMIT_Begin (Txt_FORUM_THREAD_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
          if (Order == Gbl.Forum.ThreadsOrder)
             HTM_U_Begin ();
 	 HTM_Txt (Txt_FORUM_THREAD_ORDER[Order]);
diff --git a/swad_game.c b/swad_game.c
index a940c146..4330cdd9 100644
--- a/swad_game.c
+++ b/swad_game.c
@@ -224,7 +224,7 @@ static void Gam_ListAllGames (void)
 	 Frm_StartForm (ActSeeAllGam);
 	 Pag_PutHiddenParamPagNum (Pag_GAMES,Gbl.Games.CurrentPage);
 	 Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
-	 HTM_BUTTON_Begin (Txt_GAMES_ORDER_HELP[Order],"BT_LINK TIT_TBL",NULL);
+	 HTM_BUTTON_SUBMIT_Begin (Txt_GAMES_ORDER_HELP[Order],"BT_LINK TIT_TBL",NULL);
 	 if (Order == Gbl.Games.SelectedOrder)
 	    HTM_U_Begin ();
 	 HTM_Txt (Txt_GAMES_ORDER[Order]);
@@ -449,7 +449,7 @@ void Gam_ShowOneGame (long GamCod,
    HTM_ARTICLE_Begin (Anchor);
    Frm_StartForm (ActSeeGam);
    Gam_PutParams ();
-   HTM_BUTTON_Begin (Txt_View_game,
+   HTM_BUTTON_SUBMIT_Begin (Txt_View_game,
                      Game.Hidden ? "BT_LINK ASG_TITLE_LIGHT":
                 	           "BT_LINK ASG_TITLE",
 		     NULL);
@@ -475,7 +475,7 @@ void Gam_ShowOneGame (long GamCod,
    Gam_SetParamCurrentGamCod (GamCod);	// Used to pass parameter
    Frm_StartForm (ActSeeGam);
    Gam_PutParams ();
-   HTM_BUTTON_Begin (Txt_Matches,
+   HTM_BUTTON_SUBMIT_Begin (Txt_Matches,
                      Game.Hidden ? "BT_LINK ASG_TITLE_LIGHT" :
                 	           "BT_LINK ASG_TITLE",
 		     NULL);
diff --git a/swad_hierarchy.c b/swad_hierarchy.c
index c5a75b18..c555f1bc 100644
--- a/swad_hierarchy.c
+++ b/swad_hierarchy.c
@@ -223,7 +223,7 @@ void Hie_WriteHierarchyInBreadcrumb (void)
 
    Frm_StartFormGoTo (ActMnu);
    Par_PutHiddenParamUnsigned (NULL,"NxtTab",(unsigned) TabSys);
-   HTM_BUTTON_Begin (Txt_System,ClassLink,NULL);
+   HTM_BUTTON_SUBMIT_Begin (Txt_System,ClassLink,NULL);
    HTM_Txt (Txt_System);
    HTM_BUTTON_End ();
    Frm_EndForm ();
@@ -240,7 +240,7 @@ void Hie_WriteHierarchyInBreadcrumb (void)
       /***** Form to go to see institutions of this country *****/
       Frm_StartFormGoTo (ActSeeIns);
       Cty_PutParamCtyCod (Gbl.Hierarchy.Cty.CtyCod);
-      HTM_BUTTON_Begin (Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language],ClassLink,NULL);
+      HTM_BUTTON_SUBMIT_Begin (Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language],ClassLink,NULL);
       HTM_Txt (Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]);
       HTM_BUTTON_End ();
       Frm_EndForm ();
@@ -256,7 +256,7 @@ void Hie_WriteHierarchyInBreadcrumb (void)
 
       /***** Form to go to select countries *****/
       Frm_StartFormGoTo (ActSeeCty);
-      HTM_BUTTON_Begin (Txt_Country,ClassLink,NULL);
+      HTM_BUTTON_SUBMIT_Begin (Txt_Country,ClassLink,NULL);
       HTM_Txt (Txt_Country);
       HTM_BUTTON_End ();
       Frm_EndForm ();
@@ -274,7 +274,7 @@ void Hie_WriteHierarchyInBreadcrumb (void)
       /***** Form to see centres of this institution *****/
       Frm_StartFormGoTo (ActSeeCtr);
       Ins_PutParamInsCod (Gbl.Hierarchy.Ins.InsCod);
-      HTM_BUTTON_Begin (Gbl.Hierarchy.Ins.FullName,ClassLink,NULL);
+      HTM_BUTTON_SUBMIT_Begin (Gbl.Hierarchy.Ins.FullName,ClassLink,NULL);
       HTM_Txt (Gbl.Hierarchy.Ins.ShrtName);
       HTM_BUTTON_End ();
       Frm_EndForm ();
@@ -290,7 +290,7 @@ void Hie_WriteHierarchyInBreadcrumb (void)
 
       /***** Form to go to select institutions *****/
       Frm_StartFormGoTo (ActSeeIns);
-      HTM_BUTTON_Begin (Txt_Institution,ClassLink,NULL);
+      HTM_BUTTON_SUBMIT_Begin (Txt_Institution,ClassLink,NULL);
       HTM_Txt (Txt_Institution);
       HTM_BUTTON_End ();
       Frm_EndForm ();
@@ -320,7 +320,7 @@ void Hie_WriteHierarchyInBreadcrumb (void)
       /***** Form to see degrees of this centre *****/
       Frm_StartFormGoTo (ActSeeDeg);
       Ctr_PutParamCtrCod (Gbl.Hierarchy.Ctr.CtrCod);
-      HTM_BUTTON_Begin (Gbl.Hierarchy.Ctr.FullName,ClassLink,NULL);
+      HTM_BUTTON_SUBMIT_Begin (Gbl.Hierarchy.Ctr.FullName,ClassLink,NULL);
       HTM_Txt (Gbl.Hierarchy.Ctr.ShrtName);
       HTM_BUTTON_End ();
       Frm_EndForm ();
@@ -336,7 +336,7 @@ void Hie_WriteHierarchyInBreadcrumb (void)
 
       /***** Form to go to select centres *****/
       Frm_StartFormGoTo (ActSeeCtr);
-      HTM_BUTTON_Begin (Txt_Centre,ClassLink,NULL);
+      HTM_BUTTON_SUBMIT_Begin (Txt_Centre,ClassLink,NULL);
       HTM_Txt (Txt_Centre);
       HTM_BUTTON_End ();
       Frm_EndForm ();
@@ -366,7 +366,7 @@ void Hie_WriteHierarchyInBreadcrumb (void)
       /***** Form to go to see courses of this degree *****/
       Frm_StartFormGoTo (ActSeeCrs);
       Deg_PutParamDegCod (Gbl.Hierarchy.Deg.DegCod);
-      HTM_BUTTON_Begin (Gbl.Hierarchy.Deg.FullName,ClassLink,NULL);
+      HTM_BUTTON_SUBMIT_Begin (Gbl.Hierarchy.Deg.FullName,ClassLink,NULL);
       HTM_Txt (Gbl.Hierarchy.Deg.ShrtName);
       HTM_BUTTON_End ();
       Frm_EndForm ();
@@ -382,7 +382,7 @@ void Hie_WriteHierarchyInBreadcrumb (void)
 
       /***** Form to go to select degrees *****/
       Frm_StartFormGoTo (ActSeeDeg);
-      HTM_BUTTON_Begin (Txt_Degree,ClassLink,NULL);
+      HTM_BUTTON_SUBMIT_Begin (Txt_Degree,ClassLink,NULL);
       HTM_Txt (Txt_Degree);
       HTM_BUTTON_End ();
       Frm_EndForm ();
diff --git a/swad_holiday.c b/swad_holiday.c
index 7d72aad3..8387c46f 100644
--- a/swad_holiday.c
+++ b/swad_holiday.c
@@ -125,7 +125,7 @@ void Hld_SeeHolidays (void)
 
 	    Frm_StartForm (ActSeeHld);
 	    Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
-	    HTM_BUTTON_Begin (Txt_HOLIDAYS_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
+	    HTM_BUTTON_SUBMIT_Begin (Txt_HOLIDAYS_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
 	    if (Order == Gbl.Hlds.SelectedOrder)
 	       HTM_U_Begin ();
 	    HTM_Txt (Txt_HOLIDAYS_ORDER[Order]);
diff --git a/swad_info.c b/swad_info.c
index 08cae5a4..39b59e41 100644
--- a/swad_info.c
+++ b/swad_info.c
@@ -611,7 +611,7 @@ void Inf_WriteMsgYouMustReadInfo (void)
         {
          HTM_LI_Begin (NULL);
          Frm_StartForm (Inf_ActionsSeeInfo[InfoType]);
-         HTM_BUTTON_Begin (Act_GetTitleAction (Inf_ActionsSeeInfo[InfoType]),
+         HTM_BUTTON_SUBMIT_Begin (Act_GetTitleAction (Inf_ActionsSeeInfo[InfoType]),
                            The_ClassFormLinkInBox[Gbl.Prefs.Theme],NULL);
          HTM_Txt (Act_GetTitleAction (Inf_ActionsSeeInfo[InfoType]));
          HTM_BUTTON_End ();
diff --git a/swad_institution.c b/swad_institution.c
index 160f1966..ad81f242 100644
--- a/swad_institution.c
+++ b/swad_institution.c
@@ -235,7 +235,7 @@ void Ins_DrawInstitutionLogoWithLink (struct Instit *Ins,unsigned Size)
      {
       Frm_StartForm (ActSeeInsInf);
       Ins_PutParamInsCod (Ins->InsCod);
-      HTM_BUTTON_Begin (Ins->FullName,"BT_LINK",NULL);
+      HTM_BUTTON_SUBMIT_Begin (Ins->FullName,"BT_LINK",NULL);
      }
    Log_DrawLogo (Hie_INS,Ins->InsCod,Ins->FullName,
 		 Size,NULL,true);
@@ -263,7 +263,7 @@ void Ins_DrawInstitutionLogoAndNameWithLink (struct Instit *Ins,Act_Action_t Act
    snprintf (Gbl.Title,sizeof (Gbl.Title),
 	     Txt_Go_to_X,
 	     Ins->FullName);
-   HTM_BUTTON_Begin (Gbl.Title,ClassLink,NULL);
+   HTM_BUTTON_SUBMIT_Begin (Gbl.Title,ClassLink,NULL);
 
    /***** Institution logo and name *****/
    Log_DrawLogo (Hie_INS,Ins->InsCod,Ins->ShrtName,16,ClassLogo,true);
@@ -541,7 +541,7 @@ static void Ins_Configuration (bool PrintView)
       snprintf (Gbl.Title,sizeof (Gbl.Title),
 		Txt_Centres_of_INSTITUTION_X,
 		Gbl.Hierarchy.Ins.ShrtName);
-      HTM_BUTTON_Begin (Gbl.Title,"BT_LINK DAT",NULL);
+      HTM_BUTTON_SUBMIT_Begin (Gbl.Title,"BT_LINK DAT",NULL);
       HTM_Unsigned (Ctr_GetNumCtrsInIns (Gbl.Hierarchy.Ins.InsCod));
       HTM_BUTTON_End ();
       Frm_EndForm ();
@@ -859,7 +859,7 @@ static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable)
 	{
 	 Frm_StartForm (ActSeeIns);
 	 Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
-	 HTM_BUTTON_Begin (Txt_INSTITUTIONS_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
+	 HTM_BUTTON_SUBMIT_Begin (Txt_INSTITUTIONS_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
 	 if (Order == Gbl.Hierarchy.Cty.Inss.SelectedOrder)
 	    HTM_U_Begin ();
 	}
diff --git a/swad_layout.c b/swad_layout.c
index e1deffbe..fe0afe7f 100644
--- a/swad_layout.c
+++ b/swad_layout.c
@@ -924,7 +924,7 @@ static void Lay_WritePageTopHeading (void)
    HTM_DIV_End ();	// head_row_1_logo_big
 
    HTM_DIV_Begin ("id=\"head_row_1_tagline\"");
-   HTM_BUTTON_Begin (Txt_TAGLINE,The_ClassTagline[Gbl.Prefs.Theme],NULL);
+   HTM_BUTTON_SUBMIT_Begin (Txt_TAGLINE,The_ClassTagline[Gbl.Prefs.Theme],NULL);
    HTM_Txt (Txt_TAGLINE_BR);
    HTM_BUTTON_End ();
    HTM_DIV_End ();	// head_row_1_tagline
@@ -1177,7 +1177,7 @@ void Lay_PutContextualLinkIconText (Act_Action_t NextAction,const char *Anchor,
       FuncParams ();
 
    /***** Put icon and text with link *****/
-   HTM_BUTTON_Begin (Text,The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme],NULL);
+   HTM_BUTTON_SUBMIT_Begin (Text,The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme],NULL);
    Ico_PutIconTextLink (Icon,Text);
    HTM_BUTTON_End ();
 
@@ -1211,7 +1211,7 @@ void Lay_PutContextualLinkIconTextOnSubmit (Act_Action_t NextAction,const char *
       FuncParams ();
 
    /***** Put icon with link *****/
-   HTM_BUTTON_Begin (Text,The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme],OnSubmit);
+   HTM_BUTTON_SUBMIT_Begin (Text,The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme],OnSubmit);
    Ico_PutIconTextLink (Icon,Text);
    HTM_BUTTON_End ();
 
diff --git a/swad_link.c b/swad_link.c
index 942b7bc0..39f66c1a 100644
--- a/swad_link.c
+++ b/swad_link.c
@@ -165,7 +165,7 @@ void Lnk_WriteMenuWithInstitutionalLinks (void)
       HTM_DIV_Begin ("id=\"institutional_links\"");
 
       Frm_StartForm (ActSeeLnk);
-      HTM_BUTTON_Begin (Txt_Links,"BT_LINK LINK_TITLE",NULL);
+      HTM_BUTTON_SUBMIT_Begin (Txt_Links,"BT_LINK LINK_TITLE",NULL);
       HTM_TxtF ("%s",Txt_Links);
       HTM_BUTTON_End ();
       Frm_EndForm ();
diff --git a/swad_mail.c b/swad_mail.c
index 62763bc2..fe0ca943 100644
--- a/swad_mail.c
+++ b/swad_mail.c
@@ -137,7 +137,7 @@ void Mai_SeeMailDomains (void)
 
       Frm_StartForm (ActSeeMai);
       Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
-      HTM_BUTTON_Begin (Txt_EMAIL_DOMAIN_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
+      HTM_BUTTON_SUBMIT_Begin (Txt_EMAIL_DOMAIN_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
       if (Order == Gbl.Mails.SelectedOrder)
          HTM_U_Begin ();
       HTM_Txt (Txt_EMAIL_DOMAIN_ORDER[Order]);
diff --git a/swad_menu.c b/swad_menu.c
index eb60bf5f..1e664e26 100644
--- a/swad_menu.c
+++ b/swad_menu.c
@@ -359,14 +359,11 @@ void Mnu_WriteMenuThisTab (void)
          /***** Start element *****/
 	 HTM_LI_Begin ("class=\"MENU_LIST_ITEM\"");
 
-         /***** Start container used to highlight this option *****/
-         HTM_DIV_Begin ("class=\"%s\"",
-			IsTheSelectedAction ? "MENU_OPT_ON" :
-					      "MENU_OPT_OFF");
-
          /***** Begin form and link *****/
          Frm_StartForm (NumAct);
-         HTM_BUTTON_Begin (Title,"BT_LINK",NULL);
+         HTM_BUTTON_SUBMIT_Begin (Title,
+			   IsTheSelectedAction ? "BT_LINK MENU_OPT_ON" :
+					         "BT_LINK MENU_OPT_OFF",NULL);
 
          /***** Icon and text *****/
 	 HTM_DIV_Begin ("class=\"MENU_ICO\" style=\"background-image:url('%s/%s');\"",
@@ -381,9 +378,6 @@ void Mnu_WriteMenuThisTab (void)
          HTM_BUTTON_End ();
 	 Frm_EndForm ();
 
-         /***** End container used to highlight this option *****/
-         HTM_DIV_End ();
-
          /***** End element *****/
          HTM_LI_End ();
         }
diff --git a/swad_message.c b/swad_message.c
index b4c607d7..2d8b7059 100644
--- a/swad_message.c
+++ b/swad_message.c
@@ -3157,7 +3157,7 @@ static void Msg_WriteSentOrReceivedMsgSubject (long MsgCod,const char *Subject,b
                                                         	                ActExpSntMsg));
    Gbl.Msg.MsgCod = MsgCod;	// Message to be contracted/expanded
    Msg_PutHiddenParamsOneMsg ();
-   HTM_BUTTON_Begin (Expanded ? Txt_Hide_message :
+   HTM_BUTTON_SUBMIT_Begin (Expanded ? Txt_Hide_message :
 	                        Txt_See_message,
                      Open ? "BT_LINK LT MSG_TIT" :
                 	    "BT_LINK LT MSG_TIT_NEW",
@@ -3284,7 +3284,7 @@ bool Msg_WriteCrsOrgMsg (long CrsCod)
             snprintf (Gbl.Title,sizeof (Gbl.Title),
         	      Txt_Go_to_X,
 		      Crs.FullName);
-            HTM_BUTTON_Begin (Gbl.Title,"BT_LINK AUTHOR_TXT",NULL);
+            HTM_BUTTON_SUBMIT_Begin (Gbl.Title,"BT_LINK AUTHOR_TXT",NULL);
             HTM_Txt (Crs.ShrtName);
             HTM_BUTTON_End ();
             HTM_Txt (")");
@@ -3568,7 +3568,7 @@ static void Msg_WriteMsgTo (long MsgCod)
          Gbl.Msg.MsgCod = MsgCod;	// Message to be expanded with all recipients visible
          Msg_PutHiddenParamsOneMsg ();
          Par_PutHiddenParamChar ("SeeAllRcpts",'Y');
-         HTM_BUTTON_Begin (Txt_View_all_recipients,"BT_LINK AUTHOR_TXT",NULL);
+         HTM_BUTTON_SUBMIT_Begin (Txt_View_all_recipients,"BT_LINK AUTHOR_TXT",NULL);
          HTM_TxtF (Txt_and_X_other_recipients,
                    NumRecipientsKnown - NumRecipientsToShow);
          HTM_BUTTON_End ();
diff --git a/swad_notice.c b/swad_notice.c
index 3e14108b..6135bfc9 100644
--- a/swad_notice.c
+++ b/swad_notice.c
@@ -689,7 +689,7 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing,
       /* Form to view full notice */
       Frm_StartFormAnchor (ActSeeOneNot,Anchor);
       Not_PutHiddenParamNotCod (NotCod);
-      HTM_BUTTON_Begin (Txt_See_full_notice,"BT_LINK RT",NULL);
+      HTM_BUTTON_SUBMIT_Begin (Txt_See_full_notice,"BT_LINK RT",NULL);
      }
    if (asprintf (&Id,"not_date_%u",UniqueId) < 0)
       Lay_NotEnoughMemoryExit ();
diff --git a/swad_notification.c b/swad_notification.c
index 04503490..e37a2bb2 100644
--- a/swad_notification.c
+++ b/swad_notification.c
@@ -526,7 +526,7 @@ void Ntf_ShowMyNotifications (void)
          if (PutLink)
            {
             PutLink = Ntf_StartFormGoToAction (NotifyEvent,Crs.CrsCod,&UsrDat,Cod);
-            HTM_BUTTON_Begin (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],ClassLink,NULL);
+            HTM_BUTTON_SUBMIT_Begin (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],ClassLink,NULL);
             HTM_Txt (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent]);
             HTM_BUTTON_End ();
             Frm_EndForm ();
@@ -553,7 +553,7 @@ void Ntf_ShowMyNotifications (void)
                PutLink = Ntf_StartFormGoToAction (NotifyEvent,Crs.CrsCod,&UsrDat,Cod);
 
             if (PutLink)
-               HTM_BUTTON_Begin (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],ClassLink,NULL);
+               HTM_BUTTON_SUBMIT_Begin (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],ClassLink,NULL);
             else
                HTM_SPAN_Begin ("class=\"%s\"",ClassText);
             HTM_TxtF ("%s:&nbsp;%s",Txt_Forum,ForumName);
@@ -571,7 +571,7 @@ void Ntf_ShowMyNotifications (void)
                PutLink = Ntf_StartFormGoToAction (NotifyEvent,Crs.CrsCod,&UsrDat,Cod);
 
             if (PutLink)
-               HTM_BUTTON_Begin (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],ClassLink,NULL);
+               HTM_BUTTON_SUBMIT_Begin (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],ClassLink,NULL);
             else
                HTM_SPAN_Begin ("class=\"%s\"",ClassText);
 
@@ -2081,7 +2081,7 @@ void Ntf_WriteNumberOfNewNtfs (void)
 
    /***** Begin form *****/
    Frm_StartFormId (ActSeeNewNtf,"form_ntf");
-   HTM_BUTTON_Begin (Txt_See_notifications,The_ClassNotif[Gbl.Prefs.Theme],NULL);
+   HTM_BUTTON_SUBMIT_Begin (Txt_See_notifications,The_ClassNotif[Gbl.Prefs.Theme],NULL);
 
    /***** Number of unseen notifications *****/
    HTM_SPAN_Begin ("id=\"notif_all\"");
diff --git a/swad_pagination.c b/swad_pagination.c
index 16f93878..266c8dbd 100644
--- a/swad_pagination.c
+++ b/swad_pagination.c
@@ -246,7 +246,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
                    1,Pagination->NumPags);
 	 if (asprintf (&ClassLink,"BT_LINK LT %s",ClassTxt) < 0)
 	    Lay_NotEnoughMemoryExit ();
-         HTM_BUTTON_Begin (Gbl.Title,ClassLink,NULL);
+         HTM_BUTTON_SUBMIT_Begin (Gbl.Title,ClassLink,NULL);
          free (ClassLink);
         }
       else
@@ -358,7 +358,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
          snprintf (Gbl.Title,sizeof (Gbl.Title),
                    Txt_Page_X_of_Y,
                    1,Pagination->NumPags);
-         HTM_BUTTON_Begin (Gbl.Title,ClassLink,NULL);
+         HTM_BUTTON_SUBMIT_Begin (Gbl.Title,ClassLink,NULL);
          HTM_Unsigned (1);
          HTM_BUTTON_End ();
          Frm_EndForm ();
@@ -459,7 +459,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
                    Txt_Page_X_of_Y,
                    Pagination->LeftPage,
                    Pagination->NumPags);
-         HTM_BUTTON_Begin (Gbl.Title,ClassLink,NULL);
+         HTM_BUTTON_SUBMIT_Begin (Gbl.Title,ClassLink,NULL);
          HTM_Unsigned (Pagination->LeftPage);
          HTM_BUTTON_End ();
          Frm_EndForm ();
@@ -568,7 +568,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
                   Usr_PutParamOtherUsrCodEncrypted ();
                   break;
               }
-            HTM_BUTTON_Begin (Gbl.Title,ClassLink,NULL);
+            HTM_BUTTON_SUBMIT_Begin (Gbl.Title,ClassLink,NULL);
             HTM_Unsigned (NumPage);
             HTM_BUTTON_End ();
             Frm_EndForm ();
@@ -669,7 +669,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
          snprintf (Gbl.Title,sizeof (Gbl.Title),
                    Txt_Page_X_of_Y,
                    Pagination->RightPage,Pagination->NumPags);
-         HTM_BUTTON_Begin (Gbl.Title,ClassLink,NULL);
+         HTM_BUTTON_SUBMIT_Begin (Gbl.Title,ClassLink,NULL);
          HTM_Unsigned (Pagination->RightPage);
          HTM_BUTTON_End ();
          Frm_EndForm ();
@@ -768,7 +768,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
          snprintf (Gbl.Title,sizeof (Gbl.Title),
                    Txt_Page_X_of_Y,
                    Pagination->NumPags,Pagination->NumPags);
-         HTM_BUTTON_Begin (Gbl.Title,ClassLink,NULL);
+         HTM_BUTTON_SUBMIT_Begin (Gbl.Title,ClassLink,NULL);
          HTM_Unsigned (Pagination->NumPags);
          HTM_BUTTON_End ();
          Frm_EndForm ();
diff --git a/swad_photo.c b/swad_photo.c
index b26bc11c..0dba4475 100644
--- a/swad_photo.c
+++ b/swad_photo.c
@@ -1191,7 +1191,7 @@ void Pho_ShowUsrPhoto (const struct UsrData *UsrDat,const char *PhotoURL,
       else
 	 Frm_StartForm (ActSeeOthPubPrf);
       Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
-      HTM_BUTTON_Begin (NULL,"BT_LINK CM",NULL);
+      HTM_BUTTON_SUBMIT_Begin (NULL,"BT_LINK CM",NULL);
      }
 
    /***** Hidden div to pass user's name to Javascript *****/
@@ -2466,7 +2466,7 @@ static void Pho_ShowDegreeAvgPhotoAndStat (struct Degree *Deg,
       snprintf (Gbl.Title,sizeof (Gbl.Title),
 	        Txt_Go_to_X,
 		Deg->FullName);
-      HTM_BUTTON_Begin (Gbl.Title,"BT_LINK",NULL);
+      HTM_BUTTON_SUBMIT_Begin (Gbl.Title,"BT_LINK",NULL);
      }
 
    /***** Check if photo of degree can be shown *****/
diff --git a/swad_place.c b/swad_place.c
index 2ccfa08b..675540d0 100644
--- a/swad_place.c
+++ b/swad_place.c
@@ -123,7 +123,7 @@ void Plc_SeePlaces (void)
 
 	 Frm_StartForm (ActSeePlc);
 	 Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
-	 HTM_BUTTON_Begin (Txt_PLACES_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
+	 HTM_BUTTON_SUBMIT_Begin (Txt_PLACES_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
 	 if (Order == Gbl.Plcs.SelectedOrder)
 	    HTM_U_Begin ();
 	 HTM_Txt (Txt_PLACES_ORDER[Order]);
diff --git a/swad_profile.c b/swad_profile.c
index b3d84205..18cebfec 100644
--- a/swad_profile.c
+++ b/swad_profile.c
@@ -958,7 +958,7 @@ static void Prf_ShowRanking (unsigned long Rank,unsigned long NumUsrs)
    Frm_StartForm (ActSeeUseGbl);
    Sco_PutParamScope ("ScopeSta",Hie_SYS);
    Par_PutHiddenParamUnsigned (NULL,"FigureType",(unsigned) Fig_USERS_RANKING);
-   HTM_BUTTON_Begin (Gbl.Title,The_ClassFormLinkOutBox[Gbl.Prefs.Theme],NULL);
+   HTM_BUTTON_SUBMIT_Begin (Gbl.Title,The_ClassFormLinkOutBox[Gbl.Prefs.Theme],NULL);
    HTM_TxtF ("#%lu",Rank);
    HTM_BUTTON_End ();
    Frm_EndForm ();
@@ -1772,7 +1772,7 @@ static void Prf_ShowUsrInRanking (struct UsrData *UsrDat,unsigned Rank)
       Frm_StartForm (ActSeeOthPubPrf);
       Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
       HTM_DIV_Begin ("class=\"RANK_USR\"");	// Limited width
-      HTM_BUTTON_Begin (Txt_Another_user_s_profile,"BT_LINK DAT_SMALL",NULL);
+      HTM_BUTTON_SUBMIT_Begin (Txt_Another_user_s_profile,"BT_LINK DAT_SMALL",NULL);
       Usr_WriteFirstNameBRSurnames (UsrDat);
       HTM_BUTTON_End ();
       HTM_DIV_End ();
diff --git a/swad_project.c b/swad_project.c
index dba2deb0..9c03bef1 100644
--- a/swad_project.c
+++ b/swad_project.c
@@ -904,7 +904,7 @@ static void Prj_ShowProjectsHead (Prj_ProjectView_t ProjectView)
 			   Order,
 			   Gbl.Prjs.CurrentPage,
 			   -1L);
-	    HTM_BUTTON_Begin (Txt_PROJECT_ORDER_HELP[Order],"BT_LINK TIT_TBL",NULL);
+	    HTM_BUTTON_SUBMIT_Begin (Txt_PROJECT_ORDER_HELP[Order],"BT_LINK TIT_TBL",NULL);
 	    if (Order == Gbl.Prjs.SelectedOrder)
 	       HTM_U_Begin ();
             HTM_Txt (Txt_PROJECT_ORDER[Order]);
@@ -1257,7 +1257,7 @@ static void Prj_ShowOneProject (unsigned NumIndex,struct Project *Prj,
 	{
 	 Frm_StartForm (ActAdmDocPrj);
 	 Prj_PutCurrentParams ();
-	 HTM_BUTTON_Begin (Txt_Project_files,ClassLink,NULL);
+	 HTM_BUTTON_SUBMIT_Begin (Txt_Project_files,ClassLink,NULL);
 	 HTM_Txt (Prj->Title);
 	 HTM_BUTTON_End ();
 	 Frm_EndForm ();
diff --git a/swad_record.c b/swad_record.c
index d25f4080..06ee2506 100644
--- a/swad_record.c
+++ b/swad_record.c
@@ -1489,7 +1489,7 @@ static void Rec_ShowLinkToPrintPreviewOfRecords (void)
    extern const char *Txt_record_cards_per_page;
    unsigned i;
 
-   HTM_BUTTON_Begin (Txt_Print,The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme],NULL);
+   HTM_BUTTON_SUBMIT_Begin (Txt_Print,The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme],NULL);
    Ico_PutIconTextLink ("print.svg",Txt_Print);
    HTM_BUTTON_End ();
 
@@ -2698,7 +2698,7 @@ static void Rec_ShowInstitutionInHead (struct Instit *Ins,bool PutFormLinks)
 	{
 	 Frm_StartFormGoTo (ActSeeInsInf);
 	 Ins_PutParamInsCod (Ins->InsCod);
-	 HTM_BUTTON_Begin (Ins->FullName,"BT_LINK",NULL);
+	 HTM_BUTTON_SUBMIT_Begin (Ins->FullName,"BT_LINK",NULL);
 	}
       Log_DrawLogo (Hie_INS,Ins->InsCod,Ins->ShrtName,
                     Rec_INSTITUTION_LOGO_SIZE,NULL,true);
@@ -2719,7 +2719,7 @@ static void Rec_ShowInstitutionInHead (struct Instit *Ins,bool PutFormLinks)
 	{
 	 Frm_StartFormGoTo (ActSeeInsInf);
 	 Ins_PutParamInsCod (Ins->InsCod);
-	 HTM_BUTTON_Begin (Ins->FullName,"BT_LINK REC_HEAD",NULL);
+	 HTM_BUTTON_SUBMIT_Begin (Ins->FullName,"BT_LINK REC_HEAD",NULL);
 	}
       HTM_Txt (Ins->FullName);
       if (PutFormLinks)
@@ -2792,7 +2792,7 @@ static void Rec_ShowNickname (struct UsrData *UsrDat,bool PutFormLinks)
          ItsMe = Usr_ItsMe (UsrDat->UsrCod);
 	 Frm_StartForm (ActSeeOthPubPrf);
 	 Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
-	 HTM_BUTTON_Begin (ItsMe ? Txt_My_public_profile :
+	 HTM_BUTTON_SUBMIT_Begin (ItsMe ? Txt_My_public_profile :
 			           Txt_Another_user_s_profile,
 			   "BT_LINK REC_NICK",
 			   NULL);
diff --git a/swad_statistic.c b/swad_statistic.c
index c0921a60..f8af9537 100644
--- a/swad_statistic.c
+++ b/swad_statistic.c
@@ -1618,7 +1618,7 @@ static void Sta_ShowDetailedAccessesList (unsigned long NumRows,MYSQL_RES *mysql
       snprintf (Gbl.Title,sizeof (Gbl.Title),
 	        Txt_Show_previous_X_clicks,
                 Gbl.Stat.RowsPerPage);
-      HTM_BUTTON_Begin (Gbl.Title,"BT_LINK TIT_TBL",NULL);
+      HTM_BUTTON_SUBMIT_Begin (Gbl.Title,"BT_LINK TIT_TBL",NULL);
       HTM_STRONG_Begin ();
       HTM_TxtF ("&lt;%s",Txt_PAGES_Previous);
       HTM_STRONG_End ();
@@ -1656,7 +1656,7 @@ static void Sta_ShowDetailedAccessesList (unsigned long NumRows,MYSQL_RES *mysql
       snprintf (Gbl.Title,sizeof (Gbl.Title),
 	        Txt_Show_next_X_clicks,
                 Gbl.Stat.RowsPerPage);
-      HTM_BUTTON_Begin (Gbl.Title,"BT_LINK TIT_TBL",NULL);
+      HTM_BUTTON_SUBMIT_Begin (Gbl.Title,"BT_LINK TIT_TBL",NULL);
       HTM_STRONG_Begin ();
       HTM_TxtF ("%s&gt;",Txt_PAGES_Next);
       HTM_STRONG_End ();
@@ -3780,7 +3780,7 @@ static void Sta_ShowNumHitsPerCourse (unsigned long NumRows,
          snprintf (Gbl.Title,sizeof (Gbl.Title),
                    Txt_Go_to_X,
 		   Crs.FullName);
-         HTM_BUTTON_Begin (Gbl.Title,"BT_LINK LOG",NULL);
+         HTM_BUTTON_SUBMIT_Begin (Gbl.Title,"BT_LINK LOG",NULL);
          HTM_Txt (Crs.ShrtName);
          HTM_BUTTON_End ();
         }
diff --git a/swad_survey.c b/swad_survey.c
index cb3b8f64..9acf9059 100644
--- a/swad_survey.c
+++ b/swad_survey.c
@@ -260,7 +260,7 @@ static void Svy_ListAllSurveys (struct SurveyQuestion *SvyQst)
 	 Grp_PutParamWhichGrps ();
 	 Pag_PutHiddenParamPagNum (Pag_SURVEYS,Gbl.Svys.CurrentPage);
 	 Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
-	 HTM_BUTTON_Begin (Txt_START_END_TIME_HELP[Order],"BT_LINK TIT_TBL",NULL);
+	 HTM_BUTTON_SUBMIT_Begin (Txt_START_END_TIME_HELP[Order],"BT_LINK TIT_TBL",NULL);
 	 if (Order == Gbl.Svys.SelectedOrder)
 	    HTM_U_Begin ();
 	 HTM_Txt (Txt_START_END_TIME[Order]);
@@ -528,7 +528,7 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
    Svy_PutHiddenParamSvyOrder ();
    Grp_PutParamWhichGrps ();
    Pag_PutHiddenParamPagNum (Pag_SURVEYS,Gbl.Svys.CurrentPage);
-   HTM_BUTTON_Begin (Txt_View_survey,
+   HTM_BUTTON_SUBMIT_Begin (Txt_View_survey,
                      Svy.Status.Visible ? "BT_LINK ASG_TITLE" :
 	                                  "BT_LINK ASG_TITLE_LIGHT",
 		     NULL);
diff --git a/swad_tab.c b/swad_tab.c
index 510eb9c1..296ee60e 100644
--- a/swad_tab.c
+++ b/swad_tab.c
@@ -133,7 +133,7 @@ void Tab_DrawTabs (void)
 
 	 Frm_StartForm (ActMnu);
 	 Par_PutHiddenParamUnsigned (NULL,"NxtTab",(unsigned) NumTab);
-	 HTM_BUTTON_Begin (Txt_TABS_TXT[NumTab],
+	 HTM_BUTTON_SUBMIT_Begin (Txt_TABS_TXT[NumTab],
 			   NumTab == Gbl.Action.Tab ? "BT_LINK" :
 						      "BT_LINK",
 			   NULL);
diff --git a/swad_test.c b/swad_test.c
index 26b7bddb..7a2515c3 100644
--- a/swad_test.c
+++ b/swad_test.c
@@ -2833,7 +2833,7 @@ static void Tst_ListOneOrMoreQuestionsForEdition (unsigned long NumRows,
          Dat_WriteParamsIniEndDates ();
          Tst_WriteParamEditQst ();
          Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
-         HTM_BUTTON_Begin (Txt_TST_STR_ORDER_FULL[Order],"BT_LINK TIT_TBL",NULL);
+         HTM_BUTTON_SUBMIT_Begin (Txt_TST_STR_ORDER_FULL[Order],"BT_LINK TIT_TBL",NULL);
          if (Order == Gbl.Test.SelectedOrder)
             HTM_U_Begin ();
         }
diff --git a/swad_timeline.c b/swad_timeline.c
index c7c6153b..416aa996 100644
--- a/swad_timeline.c
+++ b/swad_timeline.c
@@ -1533,12 +1533,11 @@ static void TL_WriteNote (const struct TL_Note *SocNot,
       HTM_DIV_End ();
 
       /***** Right: author's name, time, summary and buttons *****/
+      /* Begin right container */
       HTM_DIV_Begin ("class=\"TL_RIGHT_CONT TL_RIGHT_WIDTH\"");
 
-      /* Write author's full name and nickname */
+      /* Write author's full name and date-time */
       TL_WriteAuthorNote (&UsrDat);
-
-      /* Write date and time */
       TL_WriteDateTime (SocNot->DateTimeUTC);
 
       /* Write content of the note */
@@ -1641,9 +1640,10 @@ static void TL_WriteNote (const struct TL_Note *SocNot,
 	 HTM_DIV_End ();
 	}
 
-      /* End of right part */
+      /* End right container */
       HTM_DIV_End ();
 
+      /***** Buttons and comments *****/
       /* Create unique id for new comment */
       Frm_SetUniqueId (IdNewComment);
 
@@ -1685,7 +1685,7 @@ static void TL_WriteNote (const struct TL_Note *SocNot,
       /* End foot container */
       HTM_DIV_End ();
 
-      /* Show comments */
+      /* Comments */
       if (NumComments)
 	 TL_WriteCommentsInNote (SocNot,NumComments);
 
@@ -1736,7 +1736,7 @@ static void TL_WriteTopMessage (TL_TopMessage_t TopMessage,long UsrCod)
 	 /***** Show user's name inside form to go to user's public profile *****/
 	 Frm_StartFormUnique (ActSeeOthPubPrf);
 	 Usr_PutParamUsrCodEncrypted (UsrDat.EncryptedUsrCod);
-	 HTM_BUTTON_Begin (ItsMe ? Txt_My_public_profile :
+	 HTM_BUTTON_SUBMIT_Begin (ItsMe ? Txt_My_public_profile :
 				   Txt_Another_user_s_profile,
 			   "BT_LINK TL_TOP_PUBLISHER",NULL);
 	 HTM_Txt (UsrDat.FullName);
@@ -1764,34 +1764,15 @@ static void TL_WriteAuthorNote (const struct UsrData *UsrDat)
    extern const char *Txt_Another_user_s_profile;
    bool ItsMe = Usr_ItsMe (UsrDat->UsrCod);
 
-   HTM_DIV_Begin ("class=\"TL_RIGHT_AUTHOR TL_RIGHT_AUTHOR_WIDTH\"");
-
    /***** Show user's name inside form to go to user's public profile *****/
    Frm_StartFormUnique (ActSeeOthPubPrf);
    Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
-   HTM_BUTTON_Begin (ItsMe ? Txt_My_public_profile :
+   HTM_BUTTON_SUBMIT_Begin (ItsMe ? Txt_My_public_profile :
 			     Txt_Another_user_s_profile,
-	             "BT_LINK DAT_N_BOLD",NULL);
+	                    "BT_LINK TL_RIGHT_AUTHOR TL_RIGHT_AUTHOR_WIDTH DAT_N_BOLD",NULL);
    HTM_Txt (UsrDat->FullName);
    HTM_BUTTON_End ();
    Frm_EndForm ();
-
-   /***** Separator *****/
-   HTM_SPAN_Begin ("class=\"DAT_LIGHT\"");
-   HTM_NBSP ();
-   HTM_SPAN_End ();
-
-   /***** Show user's nickname inside form to go to user's public profile *****/
-   Frm_StartFormUnique (ActSeeOthPubPrf);
-   Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
-   HTM_BUTTON_Begin (ItsMe ? Txt_My_public_profile :
-			     Txt_Another_user_s_profile,
-	             "BT_LINK DAT_LIGHT",NULL);
-   HTM_TxtF ("@%s",UsrDat->Nickname);
-   HTM_BUTTON_End ();
-   Frm_EndForm ();
-
-   HTM_DIV_End ();
   }
 
 /*****************************************************************************/
@@ -2049,7 +2030,7 @@ static void TL_PutFormGoToAction (const struct TL_Note *SocNot)
       if (asprintf (&Class,"BT_LINK %s ICO_HIGHLIGHT",
 		    The_ClassFormInBoxBold[Gbl.Prefs.Theme]) < 0)
 	 Lay_NotEnoughMemoryExit ();
-      HTM_BUTTON_Begin (Txt_TIMELINE_NOTE[SocNot->NoteType],Class,NULL);
+      HTM_BUTTON_SUBMIT_Begin (Txt_TIMELINE_NOTE[SocNot->NoteType],Class,NULL);
       Ico_PutIcon (TL_Icons[SocNot->NoteType],Txt_TIMELINE_NOTE[SocNot->NoteType],"CONTEXT_ICO_x16");
       HTM_TxtF ("&nbsp;%s",Txt_TIMELINE_NOTE[SocNot->NoteType]);
       HTM_BUTTON_End ();
@@ -2345,37 +2326,19 @@ static void TL_PutFormToWriteNewPost (void)
 		     "PHOTO45x60",Pho_ZOOM,false);
    HTM_DIV_End ();
 
-   /***** Right: author's name, time, summary and buttons *****/
+   /***** Right: author's name, time, textarea *****/
    HTM_DIV_Begin ("class=\"TL_RIGHT_CONT TL_RIGHT_WIDTH\"");
 
-   /* Write author's full name and nickname */
-   HTM_DIV_Begin ("class=\"TL_RIGHT_AUTHOR TL_RIGHT_AUTHOR_WIDTH\"");
-
-   HTM_SPAN_Begin ("class=\"DAT_N_BOLD\"");
-   HTM_Txt (Gbl.Usrs.Me.UsrDat.FullName);
-   HTM_SPAN_End ();
-
-   HTM_SPAN_Begin ("class=\"DAT_LIGHT\"");
-   HTM_TxtF ("&nbsp;@%s",Gbl.Usrs.Me.UsrDat.Nickname);
-   HTM_SPAN_End ();
+   /* Author name */
+   TL_WriteAuthorNote (&Gbl.Usrs.Me.UsrDat);
 
+   /* Form to write the post */
+   HTM_DIV_Begin ("class=\"TL_FORM_NEW_PST TL_RIGHT_WIDTH\"");
+   TL_FormStart (ActRcvSocPstGbl,ActRcvSocPstUsr);
+   TL_PutTextarea (Txt_New_TIMELINE_post,"TL_PST_TEXTAREA TL_RIGHT_WIDTH");
+   Frm_EndForm ();
    HTM_DIV_End ();
 
-   /***** Form to write the post *****/
-   /* Start container */
-   HTM_DIV_Begin ("class=\"TL_FORM_NEW_PST TL_RIGHT_WIDTH\"");
-
-   /* Begin form to write the post */
-   TL_FormStart (ActRcvSocPstGbl,ActRcvSocPstUsr);
-
-   /* Textarea and button */
-   TL_PutTextarea (Txt_New_TIMELINE_post,
-                   "TL_PST_TEXTAREA TL_RIGHT_WIDTH");
-
-   /* End form */
-   Frm_EndForm ();
-
-   /* End container */
    HTM_DIV_End ();
 
    /***** End list *****/
@@ -2414,7 +2377,7 @@ static void TL_PutTextarea (const char *Placeholder,const char *ClassTextArea)
    Med_PutMediaUploader (-1,"TL_MED_INPUT_WIDTH");
 
    /***** Submit button *****/
-   HTM_BUTTON_Begin (NULL,"BT_SUBMIT_INLINE BT_CREATE",NULL);
+   HTM_BUTTON_SUBMIT_Begin (NULL,"BT_SUBMIT_INLINE BT_CREATE",NULL);
    HTM_Txt (Txt_Post);
    HTM_BUTTON_End ();
 
@@ -2779,7 +2742,7 @@ static void TL_FormToShowHiddenComments (Act_Action_t ActionGbl,Act_Action_t Act
    snprintf (Gbl.Title,sizeof (Gbl.Title),
 	     Txt_See_the_previous_X_COMMENTS,
 	     NumInitialComments);
-   HTM_BUTTON_Begin (NULL,The_ClassFormLinkInBox[Gbl.Prefs.Theme],NULL);
+   HTM_BUTTON_SUBMIT_Begin (NULL,The_ClassFormLinkInBox[Gbl.Prefs.Theme],NULL);
    Ico_PutIconTextLink ("angle-up.svg",Gbl.Title);
    HTM_BUTTON_End ();
 
@@ -2946,16 +2909,18 @@ static void TL_LinkToShowPreviousComments (const char IdComments[Frm_MAX_BYTES_I
 static void TL_PutIconToToggleComments (const char *UniqueId,
                                         const char *Icon,const char *Text)
   {
-   extern const char *The_ClassFormInBox[The_NUM_THEMES];
+   extern const char *The_ClassFormLinkInBox[The_NUM_THEMES];
+   char *OnClick;
+
+   if (asprintf (&OnClick,"toggleComments('%s')",UniqueId) < 0)
+      Lay_NotEnoughMemoryExit ();
 
    /***** Link to toggle on/off some divs *****/
-   HTM_A_Begin ("href=\"\" title=\"%s\" class=\"%s\""
-                " onclick=\"toggleComments('%s');"
-                           "return false;\"",
-                Text,The_ClassFormInBox[Gbl.Prefs.Theme],
-                UniqueId);
+   HTM_BUTTON_BUTTON_Begin (Text,The_ClassFormLinkInBox[Gbl.Prefs.Theme],OnClick);
    Ico_PutIconTextLink (Icon,Text);
-   HTM_A_End ();
+   HTM_BUTTON_End ();
+
+   free (OnClick);
   }
 
 /*****************************************************************************/
@@ -3090,7 +3055,7 @@ static void TL_WriteAuthorComment (struct UsrData *UsrDat)
    /***** Show user's name inside form to go to user's public profile *****/
    Frm_StartFormUnique (ActSeeOthPubPrf);
    Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
-   HTM_BUTTON_Begin (ItsMe ? Txt_My_public_profile :
+   HTM_BUTTON_SUBMIT_Begin (ItsMe ? Txt_My_public_profile :
 			     Txt_Another_user_s_profile,
 	             "BT_LINK DAT_BOLD",NULL);
    HTM_Txt (UsrDat->FullName);
@@ -3105,7 +3070,7 @@ static void TL_WriteAuthorComment (struct UsrData *UsrDat)
    /***** Show user's nickname inside form to go to user's public profile *****/
    Frm_StartFormUnique (ActSeeOthPubPrf);
    Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
-   HTM_BUTTON_Begin (ItsMe ? Txt_My_public_profile :
+   HTM_BUTTON_SUBMIT_Begin (ItsMe ? Txt_My_public_profile :
 			     Txt_Another_user_s_profile,
 		     "BT_LINK DAT_LIGHT",NULL);
    HTM_TxtF ("@%s",UsrDat->Nickname);
diff --git a/swad_user.c b/swad_user.c
index f24dada1..7808dedd 100644
--- a/swad_user.c
+++ b/swad_user.c
@@ -2820,7 +2820,7 @@ void Usr_WriteLoggedUsrHead (void)
 	 Lay_NotEnoughMemoryExit ();
 
       Frm_StartForm (ActFrmRolSes);
-      HTM_BUTTON_Begin (Txt_Role,ClassLink,NULL);
+      HTM_BUTTON_SUBMIT_Begin (Txt_Role,ClassLink,NULL);
       HTM_Txt (Txt_ROLES_SINGUL_Abc[Gbl.Usrs.Me.Role.Logged][Gbl.Usrs.Me.UsrDat.Sex]);
       HTM_BUTTON_End ();
       Frm_EndForm ();
@@ -6303,7 +6303,7 @@ static void Usr_FormToSelectUsrListType (void (*FuncParams) (void),
       FuncParams ();
 
    /***** Link and image *****/
-   HTM_BUTTON_Begin (Txt_USR_LIST_TYPES[ListType],
+   HTM_BUTTON_SUBMIT_Begin (Txt_USR_LIST_TYPES[ListType],
                      The_ClassFormLinkInBoxNoWrap[Gbl.Prefs.Theme],
                      Gbl.Action.Act == ActReqMsgUsr ? "CopyMessageToHiddenFields();" :
                                                       NULL);
@@ -9905,7 +9905,7 @@ void Usr_ShowTableCellWithUsrData (struct UsrData *UsrDat,unsigned NumRows)
      }
    Frm_StartForm (NextAction);
    Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
-   HTM_BUTTON_Begin (UsrDat->FullName,"BT_LINK AUTHOR_TXT",NULL);
+   HTM_BUTTON_SUBMIT_Begin (UsrDat->FullName,"BT_LINK AUTHOR_TXT",NULL);
 
    /***** Show user's ID *****/
    ID_WriteUsrIDs (UsrDat,NULL);