Index: lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
===================================================================
diff -u -r4418a2e39b64cffd77a184bd71fe05187fef9dfd -r15ef8d2626176017e80348a3f2280d6d2eef8e53
--- lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java	(.../ObjectExtractor.java)	(revision 4418a2e39b64cffd77a184bd71fe05187fef9dfd)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java	(.../ObjectExtractor.java)	(revision 15ef8d2626176017e80348a3f2280d6d2eef8e53)
@@ -3078,7 +3078,7 @@
 	    learnerChoiceGrouping.setLearnersPerGroup(null);
 
 	    Boolean equalNumberOfLearnersPerGroup = (Boolean) JsonUtil.opt(groupingDetails,
-		    AuthoringJsonTags.NUMBER_OF_GROUPS);
+		    AuthoringJsonTags.EQUAL_NUMBER_OF_LEARNERS_PER_GROUP);
 	    if (equalNumberOfLearnersPerGroup != null) {
 		learnerChoiceGrouping.setEqualNumberOfLearnersPerGroup(equalNumberOfLearnersPerGroup);
 	    }
Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
diff -u -r2481c94bba1896570e895422e4c94d7e05533423 -r15ef8d2626176017e80348a3f2280d6d2eef8e53
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 2481c94bba1896570e895422e4c94d7e05533423)
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 15ef8d2626176017e80348a3f2280d6d2eef8e53)
@@ -1539,7 +1539,8 @@
 											groupingData.groupingUIID,
 											groupingType,
 											groupingData.learnersPerGroup ? 'learners' : 'groups',
-											groupingData.numberOfGroups,
+											groupingType == 'monitor' ? 
+													groupingData.maxNumberOfGroups : groupingData.numberOfGroups,
 											groupingData.learnersPerGroup,
 											groupingData.equalNumberOfLearnersPerGroup,
 											groupingData.viewStudentsBeforeSelection,
@@ -2102,11 +2103,13 @@
 				groupings.push({
 					'groupingUIID'   				: activity.groupingUIID,
 					'groupingTypeID' 				: groupingType,
-					'learnersPerGroup' 				: activity.learnerCount,
-					'equalNumberOfLearnersPerGroup' : activity.equalSizes,
-					'viewStudentsBeforeSelection'   : activity.viewLearners,
-					'maxNumberOfGroups' 			: activity.groupCount,
-					'numberOfGroups' 				: groups.length,
+					'learnersPerGroup' 				: activity.groupDivide == 'learners' ? activity.learnerCount : null,
+					'equalNumberOfLearnersPerGroup' : activity.groupingType == 'learner' && activity.groupDivide == 'groups' 
+													  ? activity.equalSizes : null,
+					'viewStudentsBeforeSelection'   : activity.groupingType == 'learner' ? activity.viewLearners : 0,
+					'maxNumberOfGroups' 			: activity.groupingType == 'monitor' ? activity.groupCount : null,
+					'numberOfGroups' 				: activity.groupingType != 'monitor' && activity.groupDivide == 'groups'
+													  ? activity.groupCount : null,
 					'groups' 						: groups
 				});
 				
Index: lams_central/web/includes/javascript/authoring/authoringProperty.js
===================================================================
diff -u -rbbdb94f8045c3152851dad80efdf5778f49f84f0 -r15ef8d2626176017e80348a3f2280d6d2eef8e53
--- lams_central/web/includes/javascript/authoring/authoringProperty.js	(.../authoringProperty.js)	(revision bbdb94f8045c3152851dad80efdf5778f49f84f0)
+++ lams_central/web/includes/javascript/authoring/authoringProperty.js	(.../authoringProperty.js)	(revision 15ef8d2626176017e80348a3f2280d6d2eef8e53)
@@ -308,9 +308,16 @@
 					.add($('.propertiesContentFieldLearnerCount', content).closest('tr'))
 					.css('display', activity.groupingType == 'monitor' ? 'none' : '');
 				
-				$('.propertiesContentFieldEqualSizes, .propertiesContentFieldViewLearners', content)
+				// show "equal group sizes" only for Learner's Choice type and Number of Groups selected
+				$('.propertiesContentFieldEqualSizes', content)
+				   .closest('tr').css('display', activity.groupingType == 'learner' 
+					   && $('.propertiesContentFieldGroupCountEnable', content).is(':checked') ? '' : 'none');
+				
+				// show "view learners before selection" only for Learner's Choice type
+				$('.propertiesContentFieldViewLearners', content)
 					.closest('tr').css('display', activity.groupingType == 'learner' ? '' : 'none');
 				
+				
 				activity.groupDivide = activity.groupingType == 'monitor'
 									   || $('.propertiesContentFieldGroupCountEnable', content).is(':checked')
 									   ? 'groups' : 'learners';
@@ -348,14 +355,12 @@
 			
 			// create groups/learners spinners
 			$('.propertiesContentFieldGroupCount', content).spinner({
-				'min' : 2,
-				'disabled' : activity.groupDivide == 'learners'
+				'min' : 2
 			}).spinner('value', activity.groupCount)
 			  .on('spinchange', changeFunction);
 			
 			$('.propertiesContentFieldLearnerCount', content).spinner({
-				'min' 	   : 1,
-				'disabled' : activity.groupDivide == 'groups'
+				'min' 	   : 1
 			}).spinner('value', activity.learnerCount)
 			  .on('spinchange', changeFunction);