diff --git a/swad_changelog.h b/swad_changelog.h
index 71a34883a..e75959737 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -229,17 +229,22 @@
 
 // TODO: Green lock in documents is not shown when name is shortened (see OpenSWAD -> Creative Commons -> Files -> Documents)
 
+// TODO: Al listar administradores, debería estar marcado por defecto "Incluir fotos"
+
+// TODO: Al crear una nueva asignatura, falta el botón "Ir a <nombre-asignatura>"
+
 /*****************************************************************************/
 /****************************** Public constants *****************************/
 /*****************************************************************************/
 
-#define Log_PLATFORM_VERSION	"SWAD 16.211 (2017-05-10)"
+#define Log_PLATFORM_VERSION	"SWAD 16.211.1 (2017-05-10)"
 #define CSS_FILE		"swad16.209.3.css"
 #define JS_FILE			"swad16.206.3.js"
 
 // Number of lines (includes comments but not blank lines) has been got with the following command:
 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
 /*
+        Version 16.211.1: May 11, 2017	Change in layout of forms to edit groups. (218882 lines)
         Version 16.211:   May 10, 2017	Code refactoring related to alerts. (218879 lines)
         Version 16.210:   May 10, 2017	Changes in layout of records. (218869 lines)
         Version 16.209.4: May 10, 2017	Changes in layout of list of guests' records. (218838 lines)
diff --git a/swad_group.c b/swad_group.c
index b9180d76a..0370b79bb 100644
--- a/swad_group.c
+++ b/swad_group.c
@@ -252,6 +252,9 @@ static void Grp_EditGroupTypes (void)
                         Grp_PutIconsEditingGroupTypes,
                         Hlp_USERS_Groups);
 
+   /***** Put a form to create a new group type *****/
+   Grp_PutFormToCreateGroupType ();
+
    /***** Forms to edit current group types *****/
    if (Gbl.CurrentCrs.Grps.GrpTypes.Num)	// Group types found...
       Grp_ListGroupTypesForEdition ();
@@ -262,9 +265,6 @@ static void Grp_EditGroupTypes (void)
       Lay_ShowAlert (Lay_INFO,Gbl.Alert.Txt);
      }
 
-   /***** Put a form to create a new group type *****/
-   Grp_PutFormToCreateGroupType ();
-
    /***** End frame *****/
    Lay_EndRoundFrame ();
   }
@@ -283,6 +283,9 @@ static void Grp_EditGroups (void)
    Lay_StartRoundFrame (NULL,Txt_Groups,Grp_PutIconsEditingGroups,
                         Hlp_USERS_Groups);
 
+   /***** Put a form to create a new group *****/
+   Grp_PutFormToCreateGroup ();
+
    /***** Forms to edit current groups *****/
    if (Gbl.CurrentCrs.Grps.GrpTypes.NumGrpsTotal)	// If there are groups...
       Grp_ListGroupsForEdition ();
@@ -293,9 +296,6 @@ static void Grp_EditGroups (void)
       Lay_ShowAlert (Lay_INFO,Gbl.Alert.Txt);
      }
 
-   /***** Put a form to create a new group *****/
-   Grp_PutFormToCreateGroup ();
-
    /***** End frame *****/
    Lay_EndRoundFrame ();
   }