diff --git a/src/components/forms/Fields/SelectField.js b/src/components/forms/Fields/SelectField.js
index b7d2b150e..4b56e79a0 100644
--- a/src/components/forms/Fields/SelectField.js
+++ b/src/components/forms/Fields/SelectField.js
@@ -14,6 +14,8 @@ const SelectField = ({
   meta: { touched, error },
   label,
   options,
+  addEmptyOption = false,
+  emptyOptionCaption = '...',
   ...props
 }) =>
   <FormGroup
@@ -24,6 +26,10 @@ const SelectField = ({
       {label}
     </ControlLabel>
     <FormControl {...input} {...props} componentClass="select">
+      {addEmptyOption &&
+        <option value={''} key={'-1'}>
+          {emptyOptionCaption}
+        </option>}
       {options.map(({ key, name }, i) =>
         <option value={key} key={i}>
           {name}
@@ -51,7 +57,9 @@ SelectField.propTypes = {
     PropTypes.string,
     PropTypes.shape({ type: PropTypes.oneOf([FormattedMessage]) })
   ]).isRequired,
-  options: PropTypes.array.isRequired
+  options: PropTypes.array.isRequired,
+  addEmptyOption: PropTypes.bool,
+  emptyOptionCaption: PropTypes.string
 };
 
 export default SelectField;
diff --git a/src/components/forms/SisBindGroupForm/SisBindGroupForm.js b/src/components/forms/SisBindGroupForm/SisBindGroupForm.js
index 454210a72..c851485a3 100644
--- a/src/components/forms/SisBindGroupForm/SisBindGroupForm.js
+++ b/src/components/forms/SisBindGroupForm/SisBindGroupForm.js
@@ -8,7 +8,7 @@ import FormBox from '../../widgets/FormBox';
 import { SelectField } from '../Fields';
 import SubmitButton from '../SubmitButton';
 
-import { getLocalizedName } from '../../../helpers/getLocalizedData';
+import { getGroupCanonicalLocalizedName } from '../../../helpers/getLocalizedData';
 
 const SisBindGroupForm = ({
   invalid,
@@ -18,6 +18,7 @@ const SisBindGroupForm = ({
   submitting,
   hasSucceeded,
   groups,
+  groupsAccessor,
   intl: { locale }
 }) =>
   <FormBox
@@ -27,7 +28,8 @@ const SisBindGroupForm = ({
         defaultMessage="Bind existing ReCodEx group to SIS"
       />
     }
-    type={hasSucceeded ? 'success' : undefined}
+    succeeded={hasSucceeded}
+    dirty={anyTouched}
     footer={
       <div className="text-center">
         <SubmitButton
@@ -80,12 +82,13 @@ const SisBindGroupForm = ({
           defaultMessage="Group:"
         />
       }
-      options={[{ key: '', name: '...' }].concat(
-        groups.map(group => ({
+      options={groups
+        .map(group => ({
           key: group.id,
-          name: getLocalizedName(group, locale)
+          name: getGroupCanonicalLocalizedName(group, groupsAccessor, locale)
         }))
-      )}
+        .sort((a, b) => a.name.localeCompare(b.name, locale))}
+      addEmptyOption
     />
   </FormBox>;
 
@@ -98,6 +101,7 @@ SisBindGroupForm.propTypes = {
   hasSucceeded: PropTypes.bool,
   submitFailed: PropTypes.bool,
   groups: PropTypes.array,
+  groupsAccessor: PropTypes.func.isRequired,
   intl: PropTypes.shape({ locale: PropTypes.string.isRequired }).isRequired
 };
 
diff --git a/src/components/forms/SisCreateGroupForm/SisCreateGroupForm.js b/src/components/forms/SisCreateGroupForm/SisCreateGroupForm.js
index 928c70e55..0f281a68e 100644
--- a/src/components/forms/SisCreateGroupForm/SisCreateGroupForm.js
+++ b/src/components/forms/SisCreateGroupForm/SisCreateGroupForm.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { reduxForm, Field } from 'redux-form';
 import { FormattedMessage, injectIntl } from 'react-intl';
@@ -7,86 +7,100 @@ import { Alert } from 'react-bootstrap';
 import FormBox from '../../widgets/FormBox';
 import { SelectField } from '../Fields';
 import SubmitButton from '../SubmitButton';
-import { getLocalizedName } from '../../../helpers/getLocalizedData';
+import { getGroupCanonicalLocalizedName } from '../../../helpers/getLocalizedData';
 
-const SisCreateGroupForm = ({
-  invalid,
-  anyTouched,
-  handleSubmit,
-  submitFailed: hasFailed,
-  submitting,
-  hasSucceeded,
-  groups,
-  intl: { locale }
-}) =>
-  <FormBox
-    title={
-      <FormattedMessage
-        id="app.sisCreateGroupForm.title"
-        defaultMessage="Create ReCodEx group from SIS"
-      />
-    }
-    type={hasSucceeded ? 'success' : undefined}
-    footer={
-      <div className="text-center">
-        <SubmitButton
-          id="sisCreateGroup"
-          invalid={invalid}
-          submitting={submitting}
-          dirty={anyTouched}
-          hasSucceeded={hasSucceeded}
-          hasFailed={hasFailed}
-          handleSubmit={handleSubmit}
-          messages={{
-            submit: (
-              <FormattedMessage
-                id="app.sisCreateGroupForm.submit"
-                defaultMessage="Create"
-              />
-            ),
-            submitting: (
-              <FormattedMessage
-                id="app.sisCreateGroupForm.submitting"
-                defaultMessage="Creating ..."
-              />
-            ),
-            success: (
-              <FormattedMessage
-                id="app.sisCreateGroupForm.success"
-                defaultMessage="The group was created."
-              />
-            )
-          }}
-        />
-      </div>
-    }
-  >
-    {hasFailed &&
-      <Alert bsStyle="danger">
-        <FormattedMessage
-          id="app.sisCreateGroupForm.failed"
-          defaultMessage="Creating group failed. Please try again later."
-        />
-      </Alert>}
+class SisCreateGroupForm extends Component {
+  render() {
+    const {
+      invalid,
+      anyTouched,
+      handleSubmit,
+      submitFailed: hasFailed,
+      submitting,
+      hasSucceeded,
+      groups,
+      groupsAccessor,
+      intl: { locale }
+    } = this.props;
 
-    <Field
-      name="parentGroupId"
-      required
-      component={SelectField}
-      label={
-        <FormattedMessage
-          id="app.sisCreateGroupForm.parentGroup"
-          defaultMessage="Parent group:"
+    return (
+      <FormBox
+        title={
+          <FormattedMessage
+            id="app.sisCreateGroupForm.title"
+            defaultMessage="Create ReCodEx group from SIS"
+          />
+        }
+        succeeded={hasSucceeded}
+        dirty={anyTouched}
+        footer={
+          <div className="text-center">
+            <SubmitButton
+              id="sisCreateGroup"
+              invalid={invalid}
+              submitting={submitting}
+              dirty={anyTouched}
+              hasSucceeded={hasSucceeded}
+              hasFailed={hasFailed}
+              handleSubmit={handleSubmit}
+              messages={{
+                submit: (
+                  <FormattedMessage
+                    id="app.sisCreateGroupForm.submit"
+                    defaultMessage="Create"
+                  />
+                ),
+                submitting: (
+                  <FormattedMessage
+                    id="app.sisCreateGroupForm.submitting"
+                    defaultMessage="Creating ..."
+                  />
+                ),
+                success: (
+                  <FormattedMessage
+                    id="app.sisCreateGroupForm.success"
+                    defaultMessage="The group was created."
+                  />
+                )
+              }}
+            />
+          </div>
+        }
+      >
+        {hasFailed &&
+          <Alert bsStyle="danger">
+            <FormattedMessage
+              id="app.sisCreateGroupForm.failed"
+              defaultMessage="Creating group failed. Please try again later."
+            />
+          </Alert>}
+
+        <Field
+          name="parentGroupId"
+          required
+          component={SelectField}
+          label={
+            <FormattedMessage
+              id="app.sisCreateGroupForm.parentGroup"
+              defaultMessage="Parent group:"
+            />
+          }
+          options={groups
+            .map(group => ({
+              key: group.id,
+              name: getGroupCanonicalLocalizedName(
+                group,
+                groupsAccessor,
+                locale
+              )
+            }))
+            .sort((a, b) => a.name.localeCompare(b.name, locale))}
+          addEmptyOption
         />
-      }
-      options={[{ key: '', name: '...' }].concat(
-        groups.map(group => ({
-          key: group.id,
-          name: getLocalizedName(group, locale)
-        }))
-      )}
-    />
-  </FormBox>;
+      </FormBox>
+    );
+  }
+}
 
 SisCreateGroupForm.propTypes = {
   onSubmit: PropTypes.func.isRequired,
@@ -97,6 +111,7 @@ SisCreateGroupForm.propTypes = {
   hasSucceeded: PropTypes.bool,
   submitFailed: PropTypes.bool,
   groups: PropTypes.array,
+  groupsAccessor: PropTypes.func.isRequired,
   intl: PropTypes.shape({ locale: PropTypes.string.isRequired }).isRequired
 };
 
diff --git a/src/containers/SisIntegrationContainer/SisIntegrationContainer.js b/src/containers/SisIntegrationContainer/SisIntegrationContainer.js
index 848feded8..e23ce8459 100644
--- a/src/containers/SisIntegrationContainer/SisIntegrationContainer.js
+++ b/src/containers/SisIntegrationContainer/SisIntegrationContainer.js
@@ -8,6 +8,7 @@ import Button from '../../components/widgets/FlatButton';
 import { LinkContainer } from 'react-router-bootstrap';
 import Icon from 'react-fontawesome';
 
+import UsersNameContainer from '../UsersNameContainer';
 import { fetchSisStatusIfNeeded } from '../../redux/modules/sisStatus';
 import { fetchSisSubscribedGroups } from '../../redux/modules/sisSubscribedGroups';
 import { sisStateSelector } from '../../redux/selectors/sisStatus';
@@ -93,8 +94,8 @@ class SisIntegrationContainer extends Component {
                                     </th>
                                     <th>
                                       <FormattedMessage
-                                        id="app.sisIntegration.groupExtId"
-                                        defaultMessage="SIS ID"
+                                        id="app.sisIntegration.groupAdmins"
+                                        defaultMessage="Group Administrators"
                                       />
                                     </th>
                                     <th />
@@ -108,9 +109,12 @@ class SisIntegrationContainer extends Component {
                                           {getLocalizedName(group, locale)}
                                         </td>
                                         <td>
-                                          <code>
-                                            {group.externalId}
-                                          </code>
+                                          {group.primaryAdminsIds.map(id =>
+                                            <UsersNameContainer
+                                              key={id}
+                                              userId={id}
+                                            />
+                                          )}
                                         </td>
                                         <td className="text-right">
                                           <span>
@@ -140,12 +144,14 @@ class SisIntegrationContainer extends Component {
                                 </tbody>
                               </Table>
                             : <div className="text-center">
-                                <b>
-                                  <FormattedMessage
-                                    id="app.sisIntegration.noSisGroups"
-                                    defaultMessage="Currently there are no ReCodEx groups matching your SIS subjects for this time period."
-                                  />
-                                </b>
+                                <p>
+                                  <b>
+                                    <FormattedMessage
+                                      id="app.sisIntegration.noSisGroups"
+                                      defaultMessage="Currently there are no ReCodEx groups matching your SIS subjects for this time period."
+                                    />
+                                  </b>
+                                </p>
                               </div>}
                         </div>}
                     </ResourceRenderer>
diff --git a/src/containers/SisSupervisorGroupsContainer/SisSupervisorGroupsContainer.js b/src/containers/SisSupervisorGroupsContainer/SisSupervisorGroupsContainer.js
index 219bf26b7..10d51c14a 100644
--- a/src/containers/SisSupervisorGroupsContainer/SisSupervisorGroupsContainer.js
+++ b/src/containers/SisSupervisorGroupsContainer/SisSupervisorGroupsContainer.js
@@ -1,5 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 import { FormattedMessage, injectIntl } from 'react-intl';
 import Box from '../../components/widgets/Box';
@@ -8,6 +9,7 @@ import Button from '../../components/widgets/FlatButton';
 import { LinkContainer } from 'react-router-bootstrap';
 import Icon from 'react-fontawesome';
 
+import { fetchGroupsIfNeeded } from '../../redux/modules/groups';
 import { fetchSisStatusIfNeeded } from '../../redux/modules/sisStatus';
 import {
   fetchSisSupervisedCourses,
@@ -19,10 +21,13 @@ import { sisPossibleParentsSelector } from '../../redux/selectors/sisPossiblePar
 import { sisStateSelector } from '../../redux/selectors/sisStatus';
 import { sisSupervisedCoursesSelector } from '../../redux/selectors/sisSupervisedCourses';
 import { loggedInUserIdSelector } from '../../redux/selectors/auth';
+import { groupDataAccessorSelector } from '../../redux/selectors/groups';
+
+import UsersNameContainer from '../UsersNameContainer';
 import ResourceRenderer from '../../components/helpers/ResourceRenderer';
 import SisCreateGroupForm from '../../components/forms/SisCreateGroupForm';
 import SisBindGroupForm from '../../components/forms/SisBindGroupForm';
-import { getLocalizedName } from '../../helpers/getLocalizedData';
+import { getGroupCanonicalLocalizedName } from '../../helpers/getLocalizedData';
 
 import withLinks from '../../hoc/withLinks';
 import './SisSupervisorGroupsContainer.css';
@@ -64,6 +69,12 @@ class SisSupervisorGroupsContainer extends Component {
               .then(courses =>
                 courses.map(course =>
                   dispatch(fetchSisPossibleParentsIfNeeded(course.course.code))
+                    .then(res => res.value)
+                    .then(parents =>
+                      parents.map(parent =>
+                        dispatch(fetchGroupsIfNeeded(...parent.parentGroupsIds))
+                      )
+                    )
                 )
               )
           )
@@ -79,9 +90,11 @@ class SisSupervisorGroupsContainer extends Component {
       createGroup,
       bindGroup,
       sisPossibleParents,
+      groupsAccessor,
       links: { GROUP_URI_FACTORY },
       intl: { locale }
     } = this.props;
+
     return (
       <Box
         title={
@@ -116,178 +129,182 @@ class SisSupervisorGroupsContainer extends Component {
                       {`${term.year}-${term.term}`}
                     </h4>
                     <ResourceRenderer
-                      resource={sisCourses(term.year, term.term)}
+                      resource={sisCourses.get(`${term.year}-${term.term}`)}
                     >
                       {courses =>
                         <div>
-                          {courses && courses.length > 0
+                          {courses && Object.keys(courses).length > 0
                             ? <Accordion>
-                                {courses &&
-                                  courses.map((course, i) =>
-                                    <Panel
-                                      key={i}
-                                      header={
-                                        <span className="header">
-                                          <span className="leftText">
-                                            {course.groups.length > 0 &&
-                                              <Icon
-                                                name="check"
-                                                className="leftIcon"
-                                              />}
-                                            <span>
-                                              {getLocalizedData(
-                                                course.course.captions,
-                                                locale
-                                              )}{' '}
-                                              (<code>{course.course.code}</code>){' '}
-                                            </span>
+                                {Object.values(courses).map((course, i) =>
+                                  <Panel
+                                    key={i}
+                                    header={
+                                      <span className="header">
+                                        <span className="leftText">
+                                          {course.groups.length > 0 &&
+                                            <Icon
+                                              name="check"
+                                              className="leftIcon"
+                                            />}
+                                          <span>
+                                            {getLocalizedData(
+                                              course.course.captions,
+                                              locale
+                                            )}{' '}
+                                            (<code>{course.course.code}</code>){' '}
                                           </span>
-                                          <span className="pull-right">
-                                            {
-                                              getLocalizedData(days, locale)[
-                                                course.course.dayOfWeek
+                                        </span>
+                                        <span className="pull-right">
+                                          {
+                                            getLocalizedData(days, locale)[
+                                              course.course.dayOfWeek
+                                            ]
+                                          }{' '}
+                                          {course.course.time}{' '}
+                                          {course.course.fortnightly
+                                            ? getLocalizedData(oddEven, locale)[
+                                                course.course.oddWeeks ? 0 : 1
                                               ]
-                                            }{' '}
-                                            {course.course.time}{' '}
-                                            {course.course.fortnightly
-                                              ? getLocalizedData(
-                                                  oddEven,
-                                                  locale
-                                                )[
-                                                  course.course.oddWeeks ? 0 : 1
-                                                ]
-                                              : ''}
-                                          </span>
+                                            : ''}
                                         </span>
-                                      }
-                                      eventKey={i}
-                                      bsStyle={
-                                        course.course.type === 'lecture'
-                                          ? 'info'
-                                          : 'success'
-                                      }
-                                    >
-                                      {course.groups.length > 0
-                                        ? <Table hover>
-                                            <thead>
-                                              <tr>
-                                                <th>
-                                                  <FormattedMessage
-                                                    id="app.sisSupervisor.groupName"
-                                                    defaultMessage="Name"
-                                                  />
-                                                </th>
-                                                <th>
-                                                  <FormattedMessage
-                                                    id="app.sisSupervisor.groupExtId"
-                                                    defaultMessage="Group external ID"
-                                                  />
-                                                </th>
-                                                <th />
-                                              </tr>
-                                            </thead>
-                                            <tbody>
-                                              {course.groups.map((group, i) =>
-                                                <tr key={i}>
-                                                  <td>
-                                                    {getLocalizedName(
-                                                      group,
-                                                      locale
-                                                    )}
-                                                  </td>
-                                                  <td>
-                                                    <code>
-                                                      {group.externalId}
-                                                    </code>
-                                                  </td>
-                                                  <td className="text-right">
-                                                    <span>
-                                                      <LinkContainer
-                                                        to={GROUP_URI_FACTORY(
-                                                          group.id
-                                                        )}
+                                      </span>
+                                    }
+                                    eventKey={i}
+                                    bsStyle={
+                                      course.course.type === 'lecture'
+                                        ? 'info'
+                                        : 'success'
+                                    }
+                                  >
+                                    {course.groups.length > 0
+                                      ? <Table hover>
+                                          <thead>
+                                            <tr>
+                                              <th>
+                                                <FormattedMessage
+                                                  id="app.sisSupervisor.groupName"
+                                                  defaultMessage="Name"
+                                                />
+                                              </th>
+                                              <th>
+                                                <FormattedMessage
+                                                  id="app.sisSupervisor.groupAdmins"
+                                                  defaultMessage="Group Administrators"
+                                                />
+                                              </th>
+                                              <th />
+                                            </tr>
+                                          </thead>
+                                          <tbody>
+                                            {course.groups.map((group, i) =>
+                                              <tr key={i}>
+                                                <td>
+                                                  {getGroupCanonicalLocalizedName(
+                                                    group,
+                                                    groupsAccessor,
+                                                    locale
+                                                  )}
+                                                </td>
+                                                <td>
+                                                  {group.primaryAdminsIds.map(
+                                                    id =>
+                                                      <UsersNameContainer
+                                                        key={id}
+                                                        userId={id}
+                                                      />
+                                                  )}
+                                                </td>
+                                                <td className="text-right">
+                                                  <span>
+                                                    <LinkContainer
+                                                      to={GROUP_URI_FACTORY(
+                                                        group.id
+                                                      )}
+                                                    >
+                                                      <Button
+                                                        bsStyle="primary"
+                                                        bsSize="xs"
+                                                        className="btn-flat"
                                                       >
-                                                        <Button
-                                                          bsStyle="primary"
-                                                          bsSize="xs"
-                                                          className="btn-flat"
-                                                        >
-                                                          <Icon name="group" />{' '}
-                                                          <FormattedMessage
-                                                            id="app.sisSupervisor.groupDetail"
-                                                            defaultMessage="See group's page"
-                                                          />
-                                                        </Button>
-                                                      </LinkContainer>
-                                                    </span>
-                                                  </td>
-                                                </tr>
-                                              )}
-                                            </tbody>
-                                          </Table>
-                                        : <div className="text-center">
+                                                        <Icon name="group" />{' '}
+                                                        <FormattedMessage
+                                                          id="app.sisSupervisor.groupDetail"
+                                                          defaultMessage="See group's page"
+                                                        />
+                                                      </Button>
+                                                    </LinkContainer>
+                                                  </span>
+                                                </td>
+                                              </tr>
+                                            )}
+                                          </tbody>
+                                        </Table>
+                                      : <div className="text-center">
+                                          <p>
                                             <b>
                                               <FormattedMessage
                                                 id="app.sisSupervisor.noSisGroups"
                                                 defaultMessage="Currently there are no ReCodEx groups matching this SIS lecture."
                                               />
                                             </b>
-                                          </div>}
-                                      <Row>
-                                        <Col xs={6}>
-                                          <ResourceRenderer
-                                            resource={sisPossibleParents(
-                                              course.course.code
+                                          </p>
+                                        </div>}
+                                    <Row>
+                                      <Col xs={6}>
+                                        <ResourceRenderer
+                                          resource={sisPossibleParents.get(
+                                            course.course.code
+                                          )}
+                                        >
+                                          {possibleParents =>
+                                            <SisCreateGroupForm
+                                              form={
+                                                'sisCreateGroup' +
+                                                course.course.code
+                                              }
+                                              onSubmit={data =>
+                                                createGroup(
+                                                  course.course.code,
+                                                  data,
+                                                  currentUserId,
+                                                  term.year,
+                                                  term.term
+                                                )}
+                                              groups={possibleParents}
+                                              groupsAccessor={groupsAccessor}
+                                            />}
+                                        </ResourceRenderer>
+                                      </Col>
+                                      <Col xs={6}>
+                                        <SisBindGroupForm
+                                          form={
+                                            'sisBindGroup' + course.course.code
+                                          }
+                                          onSubmit={data =>
+                                            bindGroup(
+                                              course.course.code,
+                                              data,
+                                              currentUserId,
+                                              term.year,
+                                              term.term
                                             )}
-                                          >
-                                            {possibleParents =>
-                                              <SisCreateGroupForm
-                                                form={
-                                                  'sisCreateGroup' +
-                                                  course.course.code
-                                                }
-                                                onSubmit={data =>
-                                                  createGroup(
-                                                    course.course.code,
-                                                    currentUserId,
-                                                    term.year,
-                                                    term.term,
-                                                    data
-                                                  )}
-                                                groups={possibleParents}
-                                              />}
-                                          </ResourceRenderer>
-                                        </Col>
-                                        <Col xs={6}>
-                                          <SisBindGroupForm
-                                            form={
-                                              'sisBindGroup' +
-                                              course.course.code
-                                            }
-                                            onSubmit={data =>
-                                              bindGroup(
-                                                course.course.code,
-                                                data,
-                                                currentUserId,
-                                                term.year,
-                                                term.term
-                                              )}
-                                            groups={
-                                              groups !== null ? groups : []
-                                            }
-                                          />
-                                        </Col>
-                                      </Row>
-                                    </Panel>
-                                  )}
+                                          groups={groups}
+                                          groupsAccessor={groupsAccessor}
+                                        />
+                                      </Col>
+                                    </Row>
+                                  </Panel>
+                                )}
                               </Accordion>
                             : <div className="text-center">
-                                <b>
-                                  <FormattedMessage
-                                    id="app.sisIntegration.noSisGroups"
-                                    defaultMessage="Currently there are no ReCodEx groups matching your SIS subjects for this time period."
-                                  />
-                                </b>
+                                <p>
+                                  <b>
+                                    <FormattedMessage
+                                      id="app.sisIntegration.noSisGroups"
+                                      defaultMessage="Currently there are no ReCodEx groups matching your SIS subjects for this time period."
+                                    />
+                                  </b>
+                                </p>
                               </div>}
                         </div>}
                     </ResourceRenderer>
@@ -305,11 +322,12 @@ SisSupervisorGroupsContainer.propTypes = {
   currentUserId: PropTypes.string,
   groups: PropTypes.array,
   loadData: PropTypes.func.isRequired,
-  sisCourses: PropTypes.func.isRequired,
+  sisCourses: ImmutablePropTypes.map,
   createGroup: PropTypes.func.isRequired,
   bindGroup: PropTypes.func.isRequired,
   links: PropTypes.object,
-  sisPossibleParents: PropTypes.func.isRequired,
+  sisPossibleParents: ImmutablePropTypes.map,
+  groupsAccessor: PropTypes.func.isRequired,
   intl: PropTypes.shape({ locale: PropTypes.string.isRequired }).isRequired
 };
 
@@ -321,17 +339,16 @@ export default injectIntl(
         return {
           sisStatus: sisStateSelector(state),
           currentUserId,
-          sisCourses: (year, term) =>
-            sisSupervisedCoursesSelector(currentUserId, year, term)(state),
-          sisPossibleParents: courseId =>
-            sisPossibleParentsSelector(courseId)(state)
+          sisCourses: sisSupervisedCoursesSelector(state),
+          sisPossibleParents: sisPossibleParentsSelector(state),
+          groupsAccessor: groupDataAccessorSelector(state)
         };
       },
       dispatch => ({
         loadData: loggedInUserId =>
           SisSupervisorGroupsContainer.loadData(dispatch, loggedInUserId),
-        createGroup: (courseId, data) =>
-          dispatch(sisCreateGroup(courseId, data)),
+        createGroup: (courseId, data, userId, year, term) =>
+          dispatch(sisCreateGroup(courseId, data, userId, year, term)),
         bindGroup: (courseId, data, userId, year, term) =>
           dispatch(sisBindGroup(courseId, data, userId, year, term))
       })
diff --git a/src/helpers/getLocalizedData.js b/src/helpers/getLocalizedData.js
index 1de68cd7b..2910d7214 100644
--- a/src/helpers/getLocalizedData.js
+++ b/src/helpers/getLocalizedData.js
@@ -14,3 +14,24 @@ export const getOtherLocalizedNames = (entity, locale) => {
     .filter(text => text.name && text.name !== name)
     .map(({ name, locale }) => ({ name, locale }));
 };
+
+export const getGroupCanonicalLocalizedName = (
+  group,
+  groupsAccessor,
+  locale,
+  separator = ' / '
+) => {
+  var res = getLocalizedName(group, locale);
+  if (group.parentGroupsIds && groupsAccessor) {
+    const parentRes = group.parentGroupsIds
+      .filter((_, i) => i > 0) // skip the first one (the root group)
+      .map(groupsAccessor) // get the group object
+      .map(g => g.toJS()) // convert to normal JS (from immutable)
+      .map(g => (g && g.localizedTexts ? getLocalizedName(g, locale) : '??'))
+      .join(separator);
+    if (parentRes) {
+      res = parentRes + separator + res;
+    }
+  }
+  return res;
+};
diff --git a/src/locales/cs.json b/src/locales/cs.json
index 79ed5978e..6018932df 100644
--- a/src/locales/cs.json
+++ b/src/locales/cs.json
@@ -53,6 +53,8 @@
   "app.assignment.syncLimits": "Limits",
   "app.assignment.syncLocalizedTexts": "Localized texts",
   "app.assignment.syncRequired": "The exercise was updated!",
+  "app.assignment.syncScoreCalculator": "Score calculator",
+  "app.assignment.syncScoreConfig": "Score configuration",
   "app.assignment.title": "Zadání úlohy",
   "app.assignment.viewResults": "Zobrazit výsledky studenta",
   "app.assignmentStats.title": "Statistiky zadané úlohy",
@@ -132,6 +134,7 @@
   "app.createGroupForm.processing": "Skupina je právě vytvářena ...",
   "app.createGroupForm.success": "Skupina byla vytvořena",
   "app.createGroupForm.title": "Vytvořit novou skupinu",
+  "app.createGroupForm.validation.noLocalizedText": "Please add at least one localized text describing the group.",
   "app.dashboard.sisGroups": "SIS groups with ReCodEx mapping",
   "app.dashboard.studentOf": "Skupiny kde jste studentem",
   "app.dashboard.supervisorOf": "Skupiny kde jste cvičícím",
@@ -142,30 +145,21 @@
   "app.editAssignment.deleteAssignment": "Smazat zadání úlohy",
   "app.editAssignment.deleteAssignmentWarning": "Smazání zadané úlohy odstraní všechna studentská řešní. Pro případné obnovení těchto dat prosím kontaktujte správce ReCodExu.",
   "app.editAssignment.description": "Změnit nastavení zadání úlohy včetně jejích limitů",
-  "app.editAssignment.failed": "Nepodařilo se načíst nastavení zadané úlohy",
-  "app.editAssignment.failedDescription": "Nepodařilo se načíst nastavení zadané úlohy.",
-  "app.editAssignment.loading": "Načítání ...",
-  "app.editAssignment.loadingDescription": "Načítání posledního nastavení zadané úlohy ...",
   "app.editAssignment.title": "Upravit zadání úlohy",
-  "app.editAssignmentForm.addLanguage": "Přidat jazykovou mutaci",
   "app.editAssignmentForm.allowSecondDeadline": "Povolit druhý termín odevzdání.",
   "app.editAssignmentForm.canViewLimitRatios": "Viditelnost poměrů dosažených výsledků vůči limitům",
   "app.editAssignmentForm.chooseFirstDeadlineBeforeSecondDeadline": "Před nastavením druhého termínu odevzdání je nutné zvolit první termín.",
+  "app.editAssignmentForm.description": "Description for supervisors:",
   "app.editAssignmentForm.failed": "Uložení se nezdařilo. Prosíme, zkuste to později.",
   "app.editAssignmentForm.firstDeadline": "První termín odevzdání:",
   "app.editAssignmentForm.isBonus": "Zadaná úloha je bonusová, její body tedy nejsou počítány do celkového maximálního počtu bodů skupiny",
   "app.editAssignmentForm.isPublic": "Viditelné studentům",
   "app.editAssignmentForm.localized.assignment": "Zadání úlohy a popis pro studenty:",
   "app.editAssignmentForm.localized.locale": "Jazyková mutace:",
-  "app.editAssignmentForm.localized.noLanguage": "Nyní není k dispozici žádný text pro tuto úlohu.",
-  "app.editAssignmentForm.localized.reallyRemoveQuestion": "Opravdu chcete odstranit úlohu v tomto jazyce?",
+  "app.editAssignmentForm.localized.name": "Name:",
   "app.editAssignmentForm.maxPointsBeforeFirstDeadline": "Maximální počet bodů pro řešení odevzdaná před prvním termínem:",
   "app.editAssignmentForm.maxPointsBeforeSecondDeadline": "Maximální počet bodů pro řešení odevzdaná před druhým termínem:",
-  "app.editAssignmentForm.moreAboutScoreConfig": "Přečtěte si více o syntaxi <a href='https://github.com/ReCodEx/wiki/wiki/User-documentation#writing-score-configuration'>konfigurace ohodnocení</a> syntax.",
-  "app.editAssignmentForm.name": "Název úlohy:",
-  "app.editAssignmentForm.newLocale": "Nová jazyková mutace",
   "app.editAssignmentForm.pointsPercentualThreshold": "Minimální procentuální správnost řešení, za kterou lze získat nějaké body:",
-  "app.editAssignmentForm.scoreConfig": "Nastavení bodování:",
   "app.editAssignmentForm.secondDeadline": "Druhý termín odevzdání:",
   "app.editAssignmentForm.submissionsCountLimit": "Počet pokusů odevzdání:",
   "app.editAssignmentForm.submit": "Upravit nastavení",
@@ -226,6 +220,7 @@
   "app.editExercise.deleteExerciseWarning": "Smazání úlohy odstraní všechna studentská řešení a všechna zadání této úlohy.",
   "app.editExercise.description": "Změna nastavení úlohy",
   "app.editExercise.editEnvironmentConfig": "Upravit konfigurace prostředí",
+  "app.editExercise.editScoreConfig": "Edit score configurations",
   "app.editExercise.editTestConfig": "Upravit konfigurace",
   "app.editExercise.title": "Změna nastavení úlohy",
   "app.editExerciseConfig.description": "Change exercise configuration",
@@ -244,7 +239,6 @@
   "app.editExerciseConfigForm.validation.duplicatePipeline": "Please select a different pipeline.",
   "app.editExerciseConfigForm.validation.noEnvironments": "Please add at least one environment config for the exercise.",
   "app.editExerciseConfigForm.variables": "Proměnné",
-  "app.editExerciseForm.description": "Popis úlohy pro cvičící:",
   "app.editExerciseForm.difficulty": "Obtížnost",
   "app.editExerciseForm.easy": "Snadné",
   "app.editExerciseForm.failed": "Uložení se nezdařilo. Prosim, opakujte akci později.",
@@ -253,7 +247,6 @@
   "app.editExerciseForm.isLocked": "Exercise is locked (visible, but cannot be assigned to any group).",
   "app.editExerciseForm.isPublic": "Úloha je veřejná a může být použita cvičícími.",
   "app.editExerciseForm.medium": "Průměrné",
-  "app.editExerciseForm.name": "Název zadání úlohy:",
   "app.editExerciseForm.submit": "Upravit nastavení",
   "app.editExerciseForm.submitting": "Ukládání změn ...",
   "app.editExerciseForm.success": "Nastavení bylo uloženo.",
@@ -273,11 +266,22 @@
   "app.editGroup.deleteGroupWarning": "Smazání skupiny odstraní také všechny podskupiny, skupinové úlohy a zadané úlohy včetně studentských řešení.",
   "app.editGroup.description": "Změnit nastavení skupiny",
   "app.editGroup.title": "Upravit skupinu",
+  "app.editGroupForm.description": "Group description:",
   "app.editGroupForm.failed": "Uložení nastavení skupiny se nezdařilo.",
+  "app.editGroupForm.localized.locale": "The language:",
+  "app.editGroupForm.localized.name": "Name:",
   "app.editGroupForm.processing": "Ukládání ...",
   "app.editGroupForm.set": "Upravit skupinu",
   "app.editGroupForm.success": "Nastavení skupiny bylo uloženo.",
-  "app.editGroupForm.title": "Upravit skupinu",
+  "app.editGroupForm.successNew": "Create group",
+  "app.editGroupForm.titleEdit": "Edit group",
+  "app.editGroupForm.titleNew": "Create new group",
+  "app.editGroupForm.validation.description": "Please fill the description of the group.",
+  "app.editGroupForm.validation.emptyName": "Please fill the name of the group.",
+  "app.editGroupForm.validation.localizedText": "Please fill localized information.",
+  "app.editGroupForm.validation.localizedText.locale": "Please select the language.",
+  "app.editGroupForm.validation.localizedText.text": "Please fill the description in this language.",
+  "app.editGroupForm.validation.sameLocalizedTexts": "There are more language variants with the same locale. Please make sure locales are unique.",
   "app.editInstance.description": "Změnit nastavení instance",
   "app.editInstance.title": "Upravit instanci",
   "app.editInstanceForm.description": "Popis:",
@@ -290,6 +294,10 @@
   "app.editInstanceForm.title": "Upravit instanci",
   "app.editInstanceForm.validation.emptyName": "Please fill the name of the instance.",
   "app.editLimitsBox.title": "Edit limits",
+  "app.editLocalizedTextForm.addLanguage": "Add language variant",
+  "app.editLocalizedTextForm.localized.noLanguage": "There is currently no text in any language.",
+  "app.editLocalizedTextForm.localized.reallyRemoveQuestion": "Do you really want to delete this localization?",
+  "app.editLocalizedTextForm.newLocale": "New language",
   "app.editPipeline.delete": "Smazat pipelinu",
   "app.editPipeline.deleteWarning": "Smazání pipeliny rozbije všechny úlohy, které ji používají.",
   "app.editPipeline.description": "Změnit nastavení pipeliny",
@@ -309,6 +317,11 @@
   "app.editPipelineForm.validation.description": "Prosíme vyplňte popis této pipeliny.",
   "app.editPipelineForm.validation.emptyName": "Prosíme vyplňte název této pipeliny.",
   "app.editPipelineForm.validation.versionDiffers": "Někdo jiný změnit nastavení této pipeliny v průběhu vaší editace. Prosíme znovu načtěte tuto stránku a aplikujte své změny znovu.",
+  "app.editScoreConfigForm.failed": "Saving failed. Please try again later.",
+  "app.editScoreConfigForm.scoreConfig": "Score configuration:",
+  "app.editScoreConfigForm.submit": "Change configuration",
+  "app.editScoreConfigForm.submitting": "Saving configuration ...",
+  "app.editScoreConfigForm.success": "Configuration was changed.",
   "app.editUser.description": "Upravit nastavení uživatele",
   "app.editUser.title": "Upravit uživatelský profil",
   "app.editUserProfile.degreesAfterName": "Tituly za jménem:",
@@ -496,12 +509,15 @@
   "app.forkExerciseButton.fork": "Zduplikovat úlohu",
   "app.forkExerciseButton.loading": "Duplikování ...",
   "app.forkExerciseButton.success": "Ukázat zduplikovanou úlohu",
+  "app.forkExerciseForm.failed": "Saving failed. Please try again later.",
+  "app.forkExerciseForm.submit": "Fork exercise",
+  "app.forkExerciseForm.submitting": "Forking ...",
+  "app.forkExerciseForm.success": "Exercise forked",
   "app.forkPipelineButton.success": "Show the forked pipeline",
   "app.forkPipelineForm.failed": "Saving failed. Please try again later.",
   "app.forkPipelineForm.submit": "Fork pipeline",
   "app.forkPipelineForm.submitting": "Forking ...",
   "app.forkPipelineForm.success": "Pipeline forked",
-  "app.group.adminsView.addSubgroup": "Přidat podskupinu",
   "app.group.adminsView.addSupervisor": "Přidat cvičícího",
   "app.group.adminsView.title": "Administrátorský panel skupiny {groupName}",
   "app.group.createExercise": "Přidat skupinovou úlohu",
@@ -761,9 +777,10 @@
   "app.resourceDependendBreadcrumbItem.loading": "Načítání ...",
   "app.resourceRenderer.loading": "Načítání ...",
   "app.resourceRenderer.loadingFailed": "Načítání se nezdařilo.",
-  "app.resubmitSolution.resubmit": "Znovu vyhodnotit toto řešení",
   "app.resubmitSolution.resubmitAll": "Znovu vyhodnotit všechna řešení této zadané úlohy",
   "app.resubmitSolution.resubmitAllConfirm": "Opravdu chcete vyhodnotit všechna řešení všech studentů tohoto zadání úlohy? Tato akce může trvat velmi dlouho.",
+  "app.resubmitSolution.resubmitDebug": "Resubmit (debug mode)",
+  "app.resubmitSolution.resubmitNondebug": "Resubmit (normal mode)",
   "app.resultsArchiveInfoBox.description": "Detailní logy a výpisy",
   "app.resultsArchiveInfoBox.title": "Archiv s výsledky",
   "app.resultsTable.total": "Celkem",
@@ -795,14 +812,14 @@
   "app.sisCreateGroupForm.submitting": "Creating ...",
   "app.sisCreateGroupForm.success": "The group was created.",
   "app.sisCreateGroupForm.title": "Create ReCodEx group from SIS",
+  "app.sisIntegration.groupAdmins": "Group Administrators",
   "app.sisIntegration.groupDetail": "See group's page",
-  "app.sisIntegration.groupExtId": "SIS ID",
   "app.sisIntegration.groupName": "Name",
   "app.sisIntegration.noAccessible": "Your account does not support SIS integration. Please, log in using CAS-UK.",
   "app.sisIntegration.noSisGroups": "Currently there are no ReCodEx groups matching your SIS subjects for this time period.",
   "app.sisIntegration.yearTerm": "Year and term:",
+  "app.sisSupervisor.groupAdmins": "Group Administrators",
   "app.sisSupervisor.groupDetail": "See group's page",
-  "app.sisSupervisor.groupExtId": "Group external ID",
   "app.sisSupervisor.groupName": "Name",
   "app.sisSupervisor.noAccessible": "Your account does not support SIS integration. Please, log in using CAS-UK.",
   "app.sisSupervisor.noSisGroups": "Currently there are no ReCodEx groups matching this SIS lecture.",
@@ -829,6 +846,9 @@
   "app.submission.submittedAt": "Odevzdáno:",
   "app.submission.submittedBy": "Odevzdáno cvičícím:",
   "app.submission.title": "Řešení",
+  "app.submissionEvaluation.active": "Active",
+  "app.submissionEvaluation.select": "Select",
+  "app.submissionEvaluation.title": "Other submissions of this solution",
   "app.submissionStatus.accepted": "Toto řešení bylo připnuto cvičícím.",
   "app.submissions.testResultsTable.exitCode": "Exit code",
   "app.submissions.testResultsTable.memoryExceeded": "Paměťový limit",
diff --git a/src/locales/en.json b/src/locales/en.json
index 1c2e798bf..a6612c58d 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -53,6 +53,8 @@
   "app.assignment.syncLimits": "Limits",
   "app.assignment.syncLocalizedTexts": "Localized texts",
   "app.assignment.syncRequired": "The exercise was updated!",
+  "app.assignment.syncScoreCalculator": "Score calculator",
+  "app.assignment.syncScoreConfig": "Score configuration",
   "app.assignment.title": "Exercise assignment",
   "app.assignment.viewResults": "View student results",
   "app.assignmentStats.title": "Assignment statistics",
@@ -132,6 +134,7 @@
   "app.createGroupForm.processing": "Group is being created ...",
   "app.createGroupForm.success": "Group has been created",
   "app.createGroupForm.title": "Create new group",
+  "app.createGroupForm.validation.noLocalizedText": "Please add at least one localized text describing the group.",
   "app.dashboard.sisGroups": "SIS groups with ReCodEx mapping",
   "app.dashboard.studentOf": "Groups you are student of",
   "app.dashboard.supervisorOf": "Groups you supervise",
@@ -142,30 +145,21 @@
   "app.editAssignment.deleteAssignment": "Delete the assignment",
   "app.editAssignment.deleteAssignmentWarning": "Deleting an assignment will remove all the students submissions and you will have to contact the administrator of ReCodEx if you wanted to restore the assignment in the future.",
   "app.editAssignment.description": "Change assignment settings and limits",
-  "app.editAssignment.failed": "Failed loading assignment settings",
-  "app.editAssignment.failedDescription": "Assignment settings could not have been loaded.",
-  "app.editAssignment.loading": "Loading ...",
-  "app.editAssignment.loadingDescription": "Loading latest assignment settings ...",
   "app.editAssignment.title": "Edit assignment settings",
-  "app.editAssignmentForm.addLanguage": "Add language variant",
   "app.editAssignmentForm.allowSecondDeadline": "Allow second deadline.",
   "app.editAssignmentForm.canViewLimitRatios": "Visibility of memory and time ratios",
   "app.editAssignmentForm.chooseFirstDeadlineBeforeSecondDeadline": "You must select the date of the first deadline before selecting the date of the second deadline.",
+  "app.editAssignmentForm.description": "Description for supervisors:",
   "app.editAssignmentForm.failed": "Saving failed. Please try again later.",
   "app.editAssignmentForm.firstDeadline": "First deadline:",
   "app.editAssignmentForm.isBonus": "Assignment is bonus one and points from it are not included in students overall score",
   "app.editAssignmentForm.isPublic": "Visible to students",
   "app.editAssignmentForm.localized.assignment": "Description for the students:",
   "app.editAssignmentForm.localized.locale": "The language:",
-  "app.editAssignmentForm.localized.noLanguage": "There is currently no text in any language for this assignment.",
-  "app.editAssignmentForm.localized.reallyRemoveQuestion": "Do you really want to delete the assignmenet in this language?",
+  "app.editAssignmentForm.localized.name": "Name:",
   "app.editAssignmentForm.maxPointsBeforeFirstDeadline": "Maximum amount of points received when submitted before the deadline:",
   "app.editAssignmentForm.maxPointsBeforeSecondDeadline": "Maximum amount of points received when submitted before the second deadline:",
-  "app.editAssignmentForm.moreAboutScoreConfig": "Read more about <a href='https://github.com/ReCodEx/wiki/wiki/User-documentation#writing-score-configuration'>score configuration</a> syntax.",
-  "app.editAssignmentForm.name": "Assignment name:",
-  "app.editAssignmentForm.newLocale": "New language",
   "app.editAssignmentForm.pointsPercentualThreshold": "Minimum percentage of points which submissions have to gain:",
-  "app.editAssignmentForm.scoreConfig": "Score configuration:",
   "app.editAssignmentForm.secondDeadline": "Second deadline:",
   "app.editAssignmentForm.submissionsCountLimit": "Submissions count limit:",
   "app.editAssignmentForm.submit": "Edit settings",
@@ -226,6 +220,7 @@
   "app.editExercise.deleteExerciseWarning": "Deleting an exercise will remove all the students submissions and all assignments.",
   "app.editExercise.description": "Change exercise settings",
   "app.editExercise.editEnvironmentConfig": "Edit environment configurations",
+  "app.editExercise.editScoreConfig": "Edit score configurations",
   "app.editExercise.editTestConfig": "Edit configurations",
   "app.editExercise.title": "Edit exercise settings",
   "app.editExerciseConfig.description": "Change exercise configuration",
@@ -244,7 +239,6 @@
   "app.editExerciseConfigForm.validation.duplicatePipeline": "Please select a different pipeline.",
   "app.editExerciseConfigForm.validation.noEnvironments": "Please add at least one environment config for the exercise.",
   "app.editExerciseConfigForm.variables": "Variables",
-  "app.editExerciseForm.description": "Description for supervisors:",
   "app.editExerciseForm.difficulty": "Difficulty",
   "app.editExerciseForm.easy": "Easy",
   "app.editExerciseForm.failed": "Saving failed. Please try again later.",
@@ -253,7 +247,6 @@
   "app.editExerciseForm.isLocked": "Exercise is locked (visible, but cannot be assigned to any group).",
   "app.editExerciseForm.isPublic": "Exercise is public and can be assigned to students by their supervisors.",
   "app.editExerciseForm.medium": "Medium",
-  "app.editExerciseForm.name": "Exercise Name:",
   "app.editExerciseForm.submit": "Edit settings",
   "app.editExerciseForm.submitting": "Saving changes ...",
   "app.editExerciseForm.success": "Settings were saved.",
@@ -273,11 +266,22 @@
   "app.editGroup.deleteGroupWarning": "Deleting a group will remove all the subgroups, the students submissions and all the assignments and the submissions of the students.",
   "app.editGroup.description": "Change group settings",
   "app.editGroup.title": "Edit group",
+  "app.editGroupForm.description": "Group description:",
   "app.editGroupForm.failed": "Cannot save group's settings.",
+  "app.editGroupForm.localized.locale": "The language:",
+  "app.editGroupForm.localized.name": "Name:",
   "app.editGroupForm.processing": "Saving ...",
   "app.editGroupForm.set": "Edit group",
   "app.editGroupForm.success": "Group settings was saved.",
-  "app.editGroupForm.title": "Edit group",
+  "app.editGroupForm.successNew": "Create group",
+  "app.editGroupForm.titleEdit": "Edit group",
+  "app.editGroupForm.titleNew": "Create new group",
+  "app.editGroupForm.validation.description": "Please fill the description of the group.",
+  "app.editGroupForm.validation.emptyName": "Please fill the name of the group.",
+  "app.editGroupForm.validation.localizedText": "Please fill localized information.",
+  "app.editGroupForm.validation.localizedText.locale": "Please select the language.",
+  "app.editGroupForm.validation.localizedText.text": "Please fill the description in this language.",
+  "app.editGroupForm.validation.sameLocalizedTexts": "There are more language variants with the same locale. Please make sure locales are unique.",
   "app.editInstance.description": "Change instance settings",
   "app.editInstance.title": "Edit instance",
   "app.editInstanceForm.description": "Description:",
@@ -290,6 +294,10 @@
   "app.editInstanceForm.title": "Edit instance",
   "app.editInstanceForm.validation.emptyName": "Please fill the name of the instance.",
   "app.editLimitsBox.title": "Edit limits",
+  "app.editLocalizedTextForm.addLanguage": "Add language variant",
+  "app.editLocalizedTextForm.localized.noLanguage": "There is currently no text in any language.",
+  "app.editLocalizedTextForm.localized.reallyRemoveQuestion": "Do you really want to delete this localization?",
+  "app.editLocalizedTextForm.newLocale": "New language",
   "app.editPipeline.delete": "Delete the pipeline",
   "app.editPipeline.deleteWarning": "Deleting an pipeline will break all exercises using the pipeline.",
   "app.editPipeline.description": "Change pipeline settings",
@@ -309,6 +317,11 @@
   "app.editPipelineForm.validation.description": "Please fill the description of the pipeline.",
   "app.editPipelineForm.validation.emptyName": "Please fill the name of the pipeline.",
   "app.editPipelineForm.validation.versionDiffers": "Somebody has changed the pipeline while you have been editing it. Please reload the page and apply your changes once more.",
+  "app.editScoreConfigForm.failed": "Saving failed. Please try again later.",
+  "app.editScoreConfigForm.scoreConfig": "Score configuration:",
+  "app.editScoreConfigForm.submit": "Change configuration",
+  "app.editScoreConfigForm.submitting": "Saving configuration ...",
+  "app.editScoreConfigForm.success": "Configuration was changed.",
   "app.editUser.description": "Edit user's profile",
   "app.editUser.title": "Edit user's profile",
   "app.editUserProfile.degreesAfterName": "Degrees after name:",
@@ -496,12 +509,15 @@
   "app.forkExerciseButton.fork": "Fork the exercise",
   "app.forkExerciseButton.loading": "Forking ...",
   "app.forkExerciseButton.success": "Show the forked exercise",
+  "app.forkExerciseForm.failed": "Saving failed. Please try again later.",
+  "app.forkExerciseForm.submit": "Fork exercise",
+  "app.forkExerciseForm.submitting": "Forking ...",
+  "app.forkExerciseForm.success": "Exercise forked",
   "app.forkPipelineButton.success": "Show the forked pipeline",
   "app.forkPipelineForm.failed": "Saving failed. Please try again later.",
   "app.forkPipelineForm.submit": "Fork pipeline",
   "app.forkPipelineForm.submitting": "Forking ...",
   "app.forkPipelineForm.success": "Pipeline forked",
-  "app.group.adminsView.addSubgroup": "Add subgroup",
   "app.group.adminsView.addSupervisor": "Add supervisor",
   "app.group.adminsView.title": "Administrator controls of {groupName}",
   "app.group.createExercise": "Add group exercise",
@@ -761,9 +777,10 @@
   "app.resourceDependendBreadcrumbItem.loading": "Loading ...",
   "app.resourceRenderer.loading": "Loading ...",
   "app.resourceRenderer.loadingFailed": "Loading failed.",
-  "app.resubmitSolution.resubmit": "Resubmit this solution",
   "app.resubmitSolution.resubmitAll": "Resubmit all solution for this assignment",
   "app.resubmitSolution.resubmitAllConfirm": "Are you sure you want to resubmit all solutions of all students for this assignment? This can take serious amount of time.",
+  "app.resubmitSolution.resubmitDebug": "Resubmit (debug mode)",
+  "app.resubmitSolution.resubmitNondebug": "Resubmit (normal mode)",
   "app.resultsArchiveInfoBox.description": "Detailed logs and dumps",
   "app.resultsArchiveInfoBox.title": "Results archive",
   "app.resultsTable.total": "Total",
@@ -795,14 +812,14 @@
   "app.sisCreateGroupForm.submitting": "Creating ...",
   "app.sisCreateGroupForm.success": "The group was created.",
   "app.sisCreateGroupForm.title": "Create ReCodEx group from SIS",
+  "app.sisIntegration.groupAdmins": "Group Administrators",
   "app.sisIntegration.groupDetail": "See group's page",
-  "app.sisIntegration.groupExtId": "SIS ID",
   "app.sisIntegration.groupName": "Name",
   "app.sisIntegration.noAccessible": "Your account does not support SIS integration. Please, log in using CAS-UK.",
   "app.sisIntegration.noSisGroups": "Currently there are no ReCodEx groups matching your SIS subjects for this time period.",
   "app.sisIntegration.yearTerm": "Year and term:",
+  "app.sisSupervisor.groupAdmins": "Group Administrators",
   "app.sisSupervisor.groupDetail": "See group's page",
-  "app.sisSupervisor.groupExtId": "Group external ID",
   "app.sisSupervisor.groupName": "Name",
   "app.sisSupervisor.noAccessible": "Your account does not support SIS integration. Please, log in using CAS-UK.",
   "app.sisSupervisor.noSisGroups": "Currently there are no ReCodEx groups matching this SIS lecture.",
@@ -829,6 +846,9 @@
   "app.submission.submittedAt": "Submitted at:",
   "app.submission.submittedBy": "Submitted by:",
   "app.submission.title": "The solution",
+  "app.submissionEvaluation.active": "Active",
+  "app.submissionEvaluation.select": "Select",
+  "app.submissionEvaluation.title": "Other submissions of this solution",
   "app.submissionStatus.accepted": "This solution was marked by one of the supervisors as accepted.",
   "app.submissions.testResultsTable.exitCode": "Exit code",
   "app.submissions.testResultsTable.memoryExceeded": "Memory limit",
diff --git a/src/pages/Dashboard/Dashboard.js b/src/pages/Dashboard/Dashboard.js
index 984cf3c05..0947c6db3 100644
--- a/src/pages/Dashboard/Dashboard.js
+++ b/src/pages/Dashboard/Dashboard.js
@@ -26,8 +26,6 @@ import {
 
 import {
   getUser,
-  studentOfGroupsIdsSelector,
-  supervisorOfGroupsIdsSelector,
   isStudent,
   isSupervisor,
   isLoggedAsSuperAdmin
@@ -35,13 +33,13 @@ import {
 
 import { loggedInUserIdSelector } from '../../redux/selectors/auth';
 import { fetchGroupsStatsIfNeeded } from '../../redux/modules/stats';
-import { createGroupsStatsSelector } from '../../redux/selectors/stats';
+import { statisticsSelector } from '../../redux/selectors/stats';
+import { groupsSelector } from '../../redux/selectors/groups';
 import {
-  groupsAssignmentsSelector,
-  supervisorOfSelector,
-  studentOfSelector,
-  groupsSelector
-} from '../../redux/selectors/groups';
+  loggedInStudentOfGroupsAssignmentsSelector,
+  loggedInSupervisorOfSelector,
+  loggedInStudentOfSelector
+} from '../../redux/selectors/usersGroups';
 import { InfoIcon } from '../../components/icons';
 import { getJsData } from '../../redux/helpers/resourceManager';
 import SisIntegrationContainer from '../../containers/SisIntegrationContainer';
@@ -50,8 +48,11 @@ import SisSupervisorGroupsContainer from '../../containers/SisSupervisorGroupsCo
 import { getLocalizedName } from '../../helpers/getLocalizedData';
 import withLinks from '../../hoc/withLinks';
 
+const EMPTY_OBJ = {};
+
 class Dashboard extends Component {
   componentDidMount = () => this.props.loadAsync(this.props.userId);
+
   componentWillReceiveProps = newProps => {
     if (
       this.props.userId !== newProps.userId ||
@@ -94,19 +95,22 @@ class Dashboard extends Component {
       })
     );
 
+  usersStatistics(statistics) {
+    return (
+      statistics.find(stat => stat.userId === this.props.userId) || EMPTY_OBJ
+    );
+  }
+
   render() {
     const {
       user,
       student,
       studentOf,
-      studentOfGroupsIds,
       supervisor,
       supervisorOf,
-      supervisorOfGroupsIds,
       superadmin,
       groupAssignments,
-      groupStatistics,
-      usersStatistics,
+      statistics,
       allGroups,
       links: { GROUP_URI_FACTORY },
       intl: { locale }
@@ -146,7 +150,7 @@ class Dashboard extends Component {
             </p>
 
             {student &&
-              studentOfGroupsIds.length === 0 &&
+              studentOf.size === 0 &&
               <Row>
                 <Col sm={12}>
                   <div className="callout callout-success">
@@ -169,7 +173,7 @@ class Dashboard extends Component {
               </Row>}
 
             {supervisor &&
-              supervisorOfGroupsIds.length === 0 &&
+              supervisorOf.size === 0 &&
               <Row>
                 <Col sm={12}>
                   <div className="callout callout-success">
@@ -192,8 +196,8 @@ class Dashboard extends Component {
 
             {student && <SisIntegrationContainer />}
 
-            {studentOfGroupsIds.length > 0 &&
-              <ResourceRenderer resource={studentOf}>
+            {studentOf.size > 0 &&
+              <ResourceRenderer resource={studentOf.toArray()}>
                 {(...groups) =>
                   <div>
                     <h2 className="page-heading">
@@ -205,61 +209,66 @@ class Dashboard extends Component {
 
                     {groups.map(group =>
                       <div key={group.id}>
-                        <ResourceRenderer
-                          loading={
-                            <Row>
-                              <Col lg={4}>
-                                <LoadingInfoBox
-                                  title={getLocalizedName(group, locale)}
-                                />
-                              </Col>
-                            </Row>
-                          }
-                          resource={groupStatistics(group.id)}
-                        >
-                          {statistics =>
-                            <Row>
-                              <Col lg={4}>
-                                <Link to={GROUP_URI_FACTORY(group.id)}>
-                                  <UsersStats
-                                    {...group}
-                                    stats={usersStatistics(statistics)}
+                        {
+                          <ResourceRenderer
+                            loading={
+                              <Row>
+                                <Col lg={4}>
+                                  <LoadingInfoBox
+                                    title={getLocalizedName(group, locale)}
                                   />
-                                </Link>
-                              </Col>
-                              <Col lg={8}>
-                                <Box
-                                  title={<GroupsName {...group} noLink />}
-                                  collapsable
-                                  noPadding
-                                  isOpen
-                                  footer={
-                                    <p className="text-center">
-                                      <LinkContainer
-                                        to={GROUP_URI_FACTORY(group.id)}
-                                      >
-                                        <Button bsSize="sm">
-                                          <FormattedMessage
-                                            id="app.user.groupDetail"
-                                            defaultMessage="Show group's detail"
-                                          />
-                                        </Button>
-                                      </LinkContainer>
-                                    </p>
-                                  }
-                                >
-                                  <AssignmentsTable
-                                    userId={user.id}
-                                    assignments={groupAssignments(group.id)}
-                                    showGroup={false}
-                                    statuses={
-                                      usersStatistics(statistics).statuses
+                                </Col>
+                              </Row>
+                            }
+                            resource={statistics.get(group.id)}
+                          >
+                            {statistics =>
+                              <Row>
+                                <Col lg={4}>
+                                  <Link to={GROUP_URI_FACTORY(group.id)}>
+                                    <UsersStats
+                                      {...group}
+                                      stats={this.usersStatistics(statistics)}
+                                    />
+                                  </Link>
+                                </Col>
+                                <Col lg={8}>
+                                  <Box
+                                    title={getLocalizedName(group, locale)}
+                                    collapsable
+                                    noPadding
+                                    isOpen
+                                    footer={
+                                      <p className="text-center">
+                                        <LinkContainer
+                                          to={GROUP_URI_FACTORY(group.id)}
+                                        >
+                                          <Button bsSize="sm">
+                                            <FormattedMessage
+                                              id="app.user.groupDetail"
+                                              defaultMessage="Show group's detail"
+                                            />
+                                          </Button>
+                                        </LinkContainer>
+                                      </p>
                                     }
-                                  />
-                                </Box>
-                              </Col>
-                            </Row>}
-                        </ResourceRenderer>
+                                  >
+                                    <AssignmentsTable
+                                      userId={user.id}
+                                      assignments={groupAssignments.get(
+                                        group.id
+                                      )}
+                                      showGroup={false}
+                                      statuses={
+                                        this.usersStatistics(statistics)
+                                          .statuses
+                                      }
+                                    />
+                                  </Box>
+                                </Col>
+                              </Row>}
+                          </ResourceRenderer>
+                        }
                       </div>
                     )}
                   </div>}
@@ -267,13 +276,15 @@ class Dashboard extends Component {
 
             {(supervisor || superadmin) &&
               <ResourceRenderer
-                resource={superadmin ? allGroups : supervisorOf}
+                resource={
+                  superadmin ? allGroups.toArray() : supervisorOf.toArray()
+                }
               >
                 {(...groups) =>
                   <SisSupervisorGroupsContainer groups={groups} />}
               </ResourceRenderer>}
 
-            {supervisorOfGroupsIds.length > 0 &&
+            {supervisorOf.size > 0 &&
               <Row>
                 <Col sm={12}>
                   <h2 className="page-heading">
@@ -283,39 +294,43 @@ class Dashboard extends Component {
                     />
                   </h2>
 
-                  <ResourceRenderer resource={supervisorOf}>
+                  <ResourceRenderer resource={supervisorOf.toArray()}>
                     {(...groups) =>
                       <div>
                         {groups.map(group =>
                           <Row key={group.id}>
                             <Col lg={12}>
-                              <ResourceRenderer
-                                resource={groupStatistics(group.id)}
-                              >
-                                {statistics =>
-                                  <Box
-                                    title={<GroupsName {...group} noLink />}
-                                    collapsable
-                                    noPadding
-                                    isOpen
-                                    footer={
-                                      <p className="text-center">
-                                        <LinkContainer
-                                          to={GROUP_URI_FACTORY(group.id)}
-                                        >
-                                          <Button bsSize="sm">
-                                            <FormattedMessage
-                                              id="app.user.groupDetail"
-                                              defaultMessage="Show group's detail"
-                                            />
-                                          </Button>
-                                        </LinkContainer>
-                                      </p>
-                                    }
-                                  >
-                                    <StudentsListContainer groupId={group.id} />
-                                  </Box>}
-                              </ResourceRenderer>
+                              {
+                                <ResourceRenderer
+                                  resource={statistics.get(group.id)}
+                                >
+                                  {statistics =>
+                                    <Box
+                                      title={<GroupsName {...group} noLink />}
+                                      collapsable
+                                      noPadding
+                                      isOpen
+                                      footer={
+                                        <p className="text-center">
+                                          <LinkContainer
+                                            to={GROUP_URI_FACTORY(group.id)}
+                                          >
+                                            <Button bsSize="sm">
+                                              <FormattedMessage
+                                                id="app.user.groupDetail"
+                                                defaultMessage="Show group's detail"
+                                              />
+                                            </Button>
+                                          </LinkContainer>
+                                        </p>
+                                      }
+                                    >
+                                      <StudentsListContainer
+                                        groupId={group.id}
+                                      />
+                                    </Box>}
+                                </ResourceRenderer>
+                              }
                             </Col>
                           </Row>
                         )}
@@ -333,18 +348,15 @@ Dashboard.propTypes = {
   user: ImmutablePropTypes.map,
   commonGroups: PropTypes.array,
   student: PropTypes.bool,
-  studentOf: PropTypes.array,
-  studentOfGroupsIds: PropTypes.array,
+  studentOf: ImmutablePropTypes.map,
   supervisor: PropTypes.bool,
-  supervisorOf: PropTypes.array,
-  supervisorOfGroupsIds: PropTypes.array,
+  supervisorOf: ImmutablePropTypes.map,
   superadmin: PropTypes.bool,
   loadAsync: PropTypes.func.isRequired,
   userId: PropTypes.string,
-  groupAssignments: PropTypes.func.isRequired,
-  groupStatistics: PropTypes.func.isRequired,
-  usersStatistics: PropTypes.func.isRequired,
-  allGroups: PropTypes.array,
+  groupAssignments: ImmutablePropTypes.map,
+  statistics: ImmutablePropTypes.map,
+  allGroups: ImmutablePropTypes.map,
   links: PropTypes.object,
   intl: PropTypes.shape({ locale: PropTypes.string.isRequired }).isRequired
 };
@@ -359,17 +371,11 @@ export default withLinks(
         supervisor: isSupervisor(userId)(state),
         superadmin: isLoggedAsSuperAdmin(state),
         user: getUser(userId)(state),
-        studentOfGroupsIds: studentOfGroupsIdsSelector(userId)(state).toArray(),
-        studentOf: studentOfSelector(userId)(state).toArray(),
-        supervisorOfGroupsIds: supervisorOfGroupsIdsSelector(userId)(
-          state
-        ).toArray(),
-        supervisorOf: supervisorOfSelector(userId)(state).toArray(),
-        groupAssignments: groupId => groupsAssignmentsSelector(groupId)(state),
-        groupStatistics: groupId => createGroupsStatsSelector(groupId)(state),
-        usersStatistics: statistics =>
-          statistics.find(stat => stat.userId === userId) || {},
-        allGroups: groupsSelector(state).toArray()
+        studentOf: loggedInStudentOfSelector(state),
+        supervisorOf: loggedInSupervisorOfSelector(state),
+        groupAssignments: loggedInStudentOfGroupsAssignmentsSelector(state),
+        statistics: statisticsSelector(state),
+        allGroups: groupsSelector(state)
       };
     },
     (dispatch, { params }) => ({
diff --git a/src/pages/User/User.js b/src/pages/User/User.js
index 5c62d5e7b..f8955e3e9 100644
--- a/src/pages/User/User.js
+++ b/src/pages/User/User.js
@@ -313,7 +313,7 @@ export default withLinks(
         isAdmin: isSuperadmin,
         studentOfGroupsIds: studentOfGroupsIdsSelector(userId)(state).toArray(),
         groupAssignments: groupId => groupsAssignmentsSelector(groupId)(state),
-        groupStatistics: groupId => createGroupsStatsSelector(groupId)(state),
+        groupStatistics: createGroupsStatsSelector(state),
         usersStatistics: statistics =>
           statistics.find(stat => stat.userId === userId) || {},
         commonGroups
diff --git a/src/redux/middleware/loggerMiddleware.js b/src/redux/middleware/loggerMiddleware.js
index 90c982d7f..bf03e66a7 100644
--- a/src/redux/middleware/loggerMiddleware.js
+++ b/src/redux/middleware/loggerMiddleware.js
@@ -1,4 +1,5 @@
 const middleware = store => next => action => {
+  /* eslint no-console: ["error", { allow: ["log"] }] */
   let verbose = false;
   if (verbose) {
     console.log(action);
diff --git a/src/redux/modules/sisSupervisedCourses.js b/src/redux/modules/sisSupervisedCourses.js
index c8fe52ee9..f03650dc8 100644
--- a/src/redux/modules/sisSupervisedCourses.js
+++ b/src/redux/modules/sisSupervisedCourses.js
@@ -35,7 +35,7 @@ export const fetchSisSupervisedCourses = (userId, year, term) =>
     meta: { userId, year, term }
   });
 
-export const sisCreateGroup = (courseId, userId, year, term, data) =>
+export const sisCreateGroup = (courseId, data, userId, year, term) =>
   createApiAction({
     type: actionTypes.CREATE,
     method: 'POST',
@@ -57,20 +57,20 @@ const reducer = handleActions(
   Object.assign({}, reduceActions, {
     [actionTypes.CREATE_FULFILLED]: (
       state,
-      { meta: { userId, year, term }, payload }
+      { meta: { userId, courseId, year, term }, payload }
     ) =>
-      state.setIn(
-        ['resources', userId, `${year}-${term}`],
-        createRecord({ state: resourceStatus.FULFILLED, data: fromJS(payload) })
+      state.updateIn(
+        ['resources', userId, `${year}-${term}`, 'data', courseId, 'groups'],
+        groups => groups.push(fromJS(payload))
       ),
 
     [actionTypes.BIND_FULFILLED]: (
       state,
-      { meta: { userId, year, term }, payload }
+      { meta: { userId, courseId, year, term }, payload }
     ) =>
-      state.setIn(
-        ['resources', userId, `${year}-${term}`],
-        createRecord({ state: resourceStatus.FULFILLED, data: fromJS(payload) })
+      state.updateIn(
+        ['resources', userId, `${year}-${term}`, 'data', courseId, 'groups'],
+        groups => groups.push(fromJS(payload))
       ),
 
     [actionTypes.FETCH_PENDING]: (state, { meta: { userId, year, term } }) =>
@@ -88,7 +88,15 @@ const reducer = handleActions(
     ) =>
       state.setIn(
         ['resources', userId, `${year}-${term}`],
-        createRecord({ state: resourceStatus.FULFILLED, data: fromJS(payload) })
+        createRecord({
+          state: resourceStatus.FULFILLED,
+          data: fromJS(
+            payload.reduce((map, p) => {
+              map[p.course.code] = p;
+              return map;
+            }, {})
+          )
+        })
       )
   }),
   initialState
diff --git a/src/redux/selectors/groups.js b/src/redux/selectors/groups.js
index 3226f8b61..50e39dfde 100644
--- a/src/redux/selectors/groups.js
+++ b/src/redux/selectors/groups.js
@@ -1,5 +1,5 @@
 import { createSelector } from 'reselect';
-import { List } from 'immutable';
+import { List, Map } from 'immutable';
 
 import {
   studentOfGroupsIdsSelector,
@@ -11,14 +11,21 @@ import { isReady, getId, getJsData } from '../helpers/resourceManager';
 /**
  * Select groups part of the state
  */
+const EMPTY_MAP = Map();
 
 export const groupsSelector = state => state.groups.get('resources');
-const filterGroups = (ids, groups) =>
+export const filterGroups = (ids, groups) =>
   groups.filter(isReady).filter(group => ids.contains(getId(group)));
 
 export const groupSelector = id =>
   createSelector(groupsSelector, groups => groups.get(id));
 
+// This is perhaps the best way how to create simple accessor (selector with parameter).
+export const groupDataAccessorSelector = createSelector(
+  groupsSelector,
+  groups => groupId => groups.getIn([groupId, 'data'], EMPTY_MAP)
+);
+
 export const studentOfSelector = userId =>
   createSelector(
     [studentOfGroupsIdsSelector(userId), groupsSelector],
diff --git a/src/redux/selectors/sisPossibleParents.js b/src/redux/selectors/sisPossibleParents.js
index 9f5043778..64d3f60ba 100644
--- a/src/redux/selectors/sisPossibleParents.js
+++ b/src/redux/selectors/sisPossibleParents.js
@@ -1,6 +1,2 @@
-import { createSelector } from 'reselect';
-
-const getResources = state => state.sisPossibleParents.get('resources');
-
-export const sisPossibleParentsSelector = courseId =>
-  createSelector(getResources, resources => resources.get(courseId));
+export const sisPossibleParentsSelector = state =>
+  state.sisPossibleParents.get('resources');
diff --git a/src/redux/selectors/sisSupervisedCourses.js b/src/redux/selectors/sisSupervisedCourses.js
index 2961c62f7..a9ecc42e0 100644
--- a/src/redux/selectors/sisSupervisedCourses.js
+++ b/src/redux/selectors/sisSupervisedCourses.js
@@ -1,15 +1,24 @@
 import { createSelector } from 'reselect';
 import { Map } from 'immutable';
+import { loggedInUserIdSelector } from './auth';
 
 const getResources = state => state.sisSupervisedCourses.get('resources');
 
-export const sisSupervisedCoursesSelector = (userId, year, term) =>
-  createSelector(
-    getResources,
-    resources =>
-      resources &&
-      resources.get(userId) &&
-      resources.getIn([userId, `${year}-${term}`])
-        ? resources.getIn([userId, `${year}-${term}`])
-        : Map()
-  );
+const getSisStateTerms = state =>
+  state.sisStatus.getIn(['resources', 'status', 'data', 'terms']);
+
+const EMPTY_MAP = Map();
+
+export const sisSupervisedCoursesSelector = createSelector(
+  [getResources, getSisStateTerms, loggedInUserIdSelector],
+  (resources, terms, userId) => {
+    return resources && terms && terms.size > 0 && resources.get(userId)
+      ? Map(
+          terms.map(term => {
+            const termKey = term.get('year') + '-' + term.get('term');
+            return [termKey, resources.getIn([userId, termKey], EMPTY_MAP)];
+          })
+        )
+      : EMPTY_MAP;
+  }
+);
diff --git a/src/redux/selectors/stats.js b/src/redux/selectors/stats.js
index 0838b4d63..49b277cae 100644
--- a/src/redux/selectors/stats.js
+++ b/src/redux/selectors/stats.js
@@ -1,16 +1,14 @@
 import { createSelector } from 'reselect';
 import { getJsData } from '../helpers/resourceManager';
 
-const getStats = state => state.stats;
-
-const getResources = createSelector(getStats, stats => stats.get('resources'));
-
 /**
  * Public selectors
  */
 
+export const statisticsSelector = state => state.stats.get('resources');
+
 export const createGroupsStatsSelector = groupId =>
-  createSelector(getResources, stats => stats.get(groupId));
+  createSelector(statisticsSelector, stats => stats.get(groupId));
 
 const getGroupsStatsData = groupId =>
   createSelector(createGroupsStatsSelector(groupId), getJsData);
diff --git a/src/redux/selectors/usersGroups.js b/src/redux/selectors/usersGroups.js
index dc4fdc75d..47cbc747e 100644
--- a/src/redux/selectors/usersGroups.js
+++ b/src/redux/selectors/usersGroups.js
@@ -1,4 +1,13 @@
 import { createSelector } from 'reselect';
+import { List, Map } from 'immutable';
+
+import { loggedInUserSelector } from './users';
+import { groupsSelector, filterGroups } from './groups';
+import { getAssignments } from './assignments';
+import { isReady } from '../helpers/resourceManager';
+
+const EMPTY_MAP = Map();
+const EMPTY_LIST = List();
 
 // all the groups in the state
 export const allGroups = state => state.groups;
@@ -12,3 +21,45 @@ export default createSelector(
   (groups, memberOf) =>
     groups.filter(group => memberOf.indexOf(group.id) !== -1)
 );
+
+export const loggedInStudentOfGroupsIdsSelector = createSelector(
+  loggedInUserSelector,
+  user =>
+    user && isReady(user) ? user.getIn(['data', 'groups', 'studentOf']) : List()
+);
+
+export const loggedInSupervisorOfGroupsIdsSelector = createSelector(
+  loggedInUserSelector,
+  user =>
+    user && isReady(user)
+      ? user.getIn(['data', 'groups', 'supervisorOf'])
+      : List()
+);
+
+export const loggedInStudentOfSelector = createSelector(
+  [loggedInStudentOfGroupsIdsSelector, groupsSelector],
+  filterGroups
+);
+
+export const loggedInSupervisorOfSelector = createSelector(
+  [loggedInSupervisorOfGroupsIdsSelector, groupsSelector],
+  filterGroups
+);
+
+export const loggedInStudentOfGroupsAssignmentsSelector = createSelector(
+  [loggedInStudentOfSelector, groupsSelector, getAssignments],
+  (studentOf, groups, assignments) =>
+    studentOf
+      ? studentOf.reduce((result, group) => {
+          const groupAssignments =
+            group && assignments && isReady(group)
+              ? group
+                  .getIn(['data', 'assignments', 'public'], EMPTY_LIST)
+                  .map(assignmentId =>
+                    assignments.getIn(['resources', assignmentId])
+                  )
+              : EMPTY_LIST;
+          return result.set(group.getIn(['data', 'id']), groupAssignments);
+        }, Map())
+      : EMPTY_MAP
+);