diff --git a/~dev_rating/application/classes/Controller/Handler/Map.php b/~dev_rating/application/classes/Controller/Handler/Map.php
index c661b8b7595fa000e94d6029bea535665d2f8c36..91b7b8a03c27a177eb5f217d0552ffa84a5a94af 100644
--- a/~dev_rating/application/classes/Controller/Handler/Map.php
+++ b/~dev_rating/application/classes/Controller/Handler/Map.php
@@ -415,6 +415,7 @@ class Controller_Handler_Map extends Controller_Handler {
 					$this->post->offsetGet('DisciplineID')
 				); 
 				$SearchResult = array();
+
 				$i = 0;
 				foreach($SeResult as $row){
 					$i++;
@@ -424,6 +425,7 @@ class Controller_Handler_Map extends Controller_Handler {
 					$SearchResult[$i]['StudentSecond'] = $row['StudentSecond'];
 					$SearchResult[$i]['GroupGrade'] = $row['GroupGrade'];
 					$SearchResult[$i]['GroupNum'] = $row['GroupNum'];
+					$SearchResult[$i]['GroupID'] = $row['GroupID'];
 				}
 				$SearchResult['Count'] = $i;
 			}
diff --git a/~dev_rating/application/classes/Controller/Teacher/Map.php b/~dev_rating/application/classes/Controller/Teacher/Map.php
index 6738f2cc3076124c6ea032763bd322ae77c71e41..3274dbb2e80708da7ae2716382ec8c222dba7e03 100644
--- a/~dev_rating/application/classes/Controller/Teacher/Map.php
+++ b/~dev_rating/application/classes/Controller/Teacher/Map.php
@@ -250,7 +250,7 @@ class Controller_Teacher_Map extends Controller_UserEnvi {
         $students = $db->GetStudentsForDiscipline($this->UserInfo['TeacherID'], $DisciplineID);
         $studentsHandled = array();
         $i = 0;
-
+		
         foreach($students as $row) {
 			$i++;
 			$studentsHandled[$i]['StudentID'] = $row['StudentID'];
@@ -260,6 +260,7 @@ class Controller_Teacher_Map extends Controller_UserEnvi {
 			$studentsHandled[$i]['Grade'] = $row['Grade'];
 			$studentsHandled[$i]['GroupNum'] = $row['GroupNum'];
 			$studentsHandled[$i]['Type'] = $row['Type'];
+			$studentsHandled[$i]['GroupID'] = $row['GroupID'];
         }
         return $studentsHandled;
 	}
diff --git a/~dev_rating/application/views/teacher/map/EditStructure.twig b/~dev_rating/application/views/teacher/map/EditStructure.twig
index 8c6b9e274f5791e705fe84ec96cffb044b2ef885..cae846acf20edcdf70823ed0848df6683f48f052 100644
--- a/~dev_rating/application/views/teacher/map/EditStructure.twig
+++ b/~dev_rating/application/views/teacher/map/EditStructure.twig
@@ -6,13 +6,13 @@
 
 {% block map_content %}
 	<p class="top_center_info" style="display: none">Учебная карта дисциплины на 1 семестр 2014 года</p>
-	<div class="studyMap">
+	<div class="studyMap StructureTable">
 		<div class="name">Виды контрольных мероприятий</div>
 		<div class="currentControl">Текущий контроль</div>
 		<div class="landmarkControl">Рубежный контроль</div>
 		<div class="actions" style="text-align: right; padding-right: 30px;">Действия</div>
 	</div>
-	<div class="moduleList">
+	<div class="moduleList StructureTable">
 	{% for i in range(1, Map.ModulesCount) if Map.ModulesCount > 0 %}
 		<div class="moduleGroup" id="{{ Map[i].ModuleID }}">
 			<div class="moduleHead">
diff --git a/~dev_rating/application/views/teacher/map/EditStudents.twig b/~dev_rating/application/views/teacher/map/EditStudents.twig
index 15c5cd7b64ca34148cf29a1e4b8e2aa601bdb894..b54734b756a495d17ae2b49ec80b1250574819b9 100644
--- a/~dev_rating/application/views/teacher/map/EditStudents.twig
+++ b/~dev_rating/application/views/teacher/map/EditStudents.twig
@@ -15,9 +15,9 @@
 				{% if not loop.first %}
 					</div>
 				{% endif %}
-				<div class="GradeAndGroupTitle" id="{{ Student.Grade }}_{{ Student.GroupNum }}">
+				<div class="GradeAndGroupTitle ActionShowHideGroupContainer" id="{{ Student.GroupID }}">
 					<span class="info">Курс {{ Student.Grade }}, Группа {{ Student.GroupNum }}</span>
-					<span class="ActionShowHideGroupContainer">Открыть список ▼</span>
+					<span class="Action">Открыть список ▼</span>
 				</div>
 				<div class="GroupContainer">
 					{% set NowGroupNum = Student.GroupNum %}
diff --git a/~dev_rating/media/css/construct.css b/~dev_rating/media/css/construct.css
index 1fdf146c5970811b70ca7871caa6536f5ffecbc6..05fa6cf094ea7009d536c0bad14609613dd21708 100644
--- a/~dev_rating/media/css/construct.css
+++ b/~dev_rating/media/css/construct.css
@@ -109,23 +109,23 @@
 		Общие стили для шапки учебной карты (НЕ шапки страницы),
 		модуля и мероприятия (подмодуля)
 	*/
-	.name { /* Название */
+	.StructureTable .name { /* Название */
 		width: 250px;
 		float: left;
 		display: inline;
 		margin-right: 60px;
 	}
-	.currentControl{ /* Текущий контроль */
+	.StructureTable .currentControl{ /* Текущий контроль */
 		width: 150px;
 		float: left;
 		display: inline;
 	}
-	.landmarkControl{ /* Рубежный контроль */
+	.StructureTable .landmarkControl{ /* Рубежный контроль */
 		width: 150px;
 		float: left;
 		display: inline;
 	}
-	.actions{ /* Действия */
+	.StructureTable .actions{ /* Действия */
 		width: 160px;
 		float: right;
 		display: inline;
@@ -243,8 +243,11 @@
 		font-size: 14px;
 		color: #333;
 	}
-		.GradeAndGroupTitle .ActionShowHideGroupContainer{
-			margin-left: 40px;
+		.GradeAndGroupTitle .info {
+			float: left;
+		}
+		.GradeAndGroupTitle .Action{
+			float: right;
 			font-size: 13px;
 			cursor: pointer
 		}
@@ -253,7 +256,7 @@
 	}
 	.StudentsList .Student {
 		margin: 10px 0;
-		padding: 10px;
+		padding: 7px 10px;
 	}
 		.StudentsList .Student .Name {
 			float: left;
diff --git a/~dev_rating/media/js/construct/edit.js b/~dev_rating/media/js/construct/edit.js
index 8b1f549dd2fd9204977765f9953b4d0a2840aac2..97e6546aac74c1fcc84da527fb47d8133c0f9b09 100644
--- a/~dev_rating/media/js/construct/edit.js
+++ b/~dev_rating/media/js/construct/edit.js
@@ -663,13 +663,13 @@ $('.StudentsList').on('click', '.Action_UnbindStudent', function(){
 });
 
 $('.StudentsList').on('click', '.ActionShowHideGroupContainer', function(){
-	if ($(this).parent().next('.GroupContainer').css('display') == 'none') {
-		$(this).text('Скрыть список ▲');
-		$(this).parent().next('.GroupContainer').show();
+	if ($(this).next('.GroupContainer').css('display') == 'none') {
+		$(this).children('.Action').text('Скрыть список ▲');
+		$(this).next('.GroupContainer').show();
 	}
 	else {
-		$(this).text('Открыть список ▼');
-		$(this).parent().next('.GroupContainer').hide();
+		$(this).children('.Action').text('Открыть список ▼');
+		$(this).next('.GroupContainer').hide();
 	}
 });