diff --git a/README.md b/README.md
index d7aa9f1cb..4d430206e 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,10 @@ NODE_ENV=development
 API_BASE=http://localhost:4000/v1
 PORT=8080
 WEBPACK_DEV_SERVER_PORT=8081
+TITLE=ReCodEx
+ALLOW_NORMAL_REGISTRATION=true
+ALLOW_LDAP_REGISTRATION=false
+ALLOW_CAS_REGISTRATION=true
 ```
 
 ## Run Dev
@@ -37,7 +41,7 @@ yarn build
 yarn start
 ```
 
-Consider using [PM2](http://pm2.keymetrics.io/) or similar tool to run the `yarn start` command to prevent crashes of the web service.
+Consider using [PM2](http://pm2.keymetrics.io/) or similar tool to run the `yarn start` command to prevent crashes of the web service. It is wise to use watch mode of PM2 in `prod/` subdirectory and deploy the app using `yarn deploy` command.
 
 ## License
 
diff --git a/src/components/Assignments/AdminAssignmentsTable/AdminAssignmentsTable.js b/src/components/Assignments/AdminAssignmentsTable/AdminAssignmentsTable.js
index 5749570a9..3be64e962 100644
--- a/src/components/Assignments/AdminAssignmentsTable/AdminAssignmentsTable.js
+++ b/src/components/Assignments/AdminAssignmentsTable/AdminAssignmentsTable.js
@@ -3,14 +3,14 @@ import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { List } from 'immutable';
 import { Table } from 'react-bootstrap';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage, injectIntl } from 'react-intl';
 
 import AdminAssignmentsTableRow from './AdminAssignmentsTableRow';
 import NoAssignmentsTableRow from './NoAssignmentsTableRow';
 import LoadingAssignmentTableRow from './LoadingAssignmentTableRow';
 import ResourceRenderer from '../../helpers/ResourceRenderer';
 
-const AdminAssignmentsTable = ({ assignments = List() }) => (
+const AdminAssignmentsTable = ({ assignments = List(), intl: { locale } }) =>
   <Table hover>
     <thead>
       <tr>
@@ -51,25 +51,28 @@ const AdminAssignmentsTable = ({ assignments = List() }) => (
     >
       {(...assignments) =>
         assignments.length === 0
-          ? <tbody><NoAssignmentsTableRow /></tbody>
+          ? <tbody>
+              <NoAssignmentsTableRow />
+            </tbody>
           : <tbody>
               {assignments
                 .sort((a, b) => a.firstDeadline - b.firstDeadline)
-                .map(assignment => (
+                .map(assignment =>
                   <AdminAssignmentsTableRow
                     key={assignment.id}
                     {...assignment}
+                    locale={locale}
                   />
-                ))}
+                )}
             </tbody>}
     </ResourceRenderer>
-  </Table>
-);
+  </Table>;
 
 AdminAssignmentsTable.propTypes = {
   assignments: ImmutablePropTypes.list.isRequired,
   showGroup: PropTypes.bool,
-  statuses: PropTypes.object
+  statuses: PropTypes.object,
+  intl: PropTypes.shape({ locale: PropTypes.string.isRequired }).isRequired
 };
 
-export default AdminAssignmentsTable;
+export default injectIntl(AdminAssignmentsTable);
diff --git a/src/components/Assignments/AdminAssignmentsTable/AdminAssignmentsTableRow.js b/src/components/Assignments/AdminAssignmentsTable/AdminAssignmentsTableRow.js
index c89122133..0065cf131 100644
--- a/src/components/Assignments/AdminAssignmentsTable/AdminAssignmentsTableRow.js
+++ b/src/components/Assignments/AdminAssignmentsTable/AdminAssignmentsTableRow.js
@@ -5,10 +5,10 @@ import { FormattedDate, FormattedTime, FormattedMessage } from 'react-intl';
 import { ButtonGroup } from 'react-bootstrap';
 import Button from '../../widgets/FlatButton';
 import { LinkContainer } from 'react-router-bootstrap';
-import DeleteAssignmentButtonContainer
-  from '../../../containers/DeleteAssignmentButtonContainer';
+import DeleteAssignmentButtonContainer from '../../../containers/DeleteAssignmentButtonContainer';
 
 import withLinks from '../../../hoc/withLinks';
+import { getLocalizedName } from '../../../helpers/getLocalizedData';
 import {
   EditIcon,
   MaybePublicIcon,
@@ -20,30 +20,36 @@ const AdminAssignmentTableRow = ({
   isPublic,
   name,
   allowSecondDeadline,
+  localizedTexts,
   firstDeadline,
   secondDeadline,
   isBonus,
+  locale,
   links: {
     ASSIGNMENT_DETAIL_URI_FACTORY: detail,
     ASSIGNMENT_EDIT_URI_FACTORY: edit
   }
-}) => (
+}) =>
   <tr>
     <td className="text-center">
       <MaybePublicIcon id={id} isPublic={isPublic} />
     </td>
     <td>
       <MaybeBonusAssignmentIcon id={id} isBonus={isBonus} />
-      <Link to={detail(id)}>{name}</Link>
+      <Link to={detail(id)}>
+        {getLocalizedName({ name, localizedTexts }, locale)}
+      </Link>
     </td>
     <td>
-      <FormattedDate value={new Date(firstDeadline * 1000)} />{', '}
+      <FormattedDate value={new Date(firstDeadline * 1000)} />
+      {', '}
       <FormattedTime value={new Date(firstDeadline * 1000)} />
     </td>
     <td>
       {allowSecondDeadline
         ? <span>
-            <FormattedDate value={new Date(secondDeadline * 1000)} />{', '}
+            <FormattedDate value={new Date(secondDeadline * 1000)} />
+            {', '}
             <FormattedTime value={new Date(secondDeadline * 1000)} />
           </span>
         : <span>-</span>}
@@ -52,8 +58,7 @@ const AdminAssignmentTableRow = ({
       <ButtonGroup>
         <LinkContainer to={edit(id)}>
           <Button bsSize="xs" bsStyle="warning">
-            <EditIcon />
-            {' '}
+            <EditIcon />{' '}
             <FormattedMessage
               id="app.adminAssignmentsTableRow.edit"
               defaultMessage="Edit"
@@ -63,19 +68,20 @@ const AdminAssignmentTableRow = ({
         <DeleteAssignmentButtonContainer id={id} bsSize="xs" />
       </ButtonGroup>
     </td>
-  </tr>
-);
+  </tr>;
 
 AdminAssignmentTableRow.propTypes = {
   id: PropTypes.any.isRequired,
   isPublic: PropTypes.bool.isRequired,
   isBonus: PropTypes.bool.isRequired,
   name: PropTypes.string.isRequired,
+  localizedTexts: PropTypes.array.isRequired,
   firstDeadline: PropTypes.number.isRequired,
   allowSecondDeadline: PropTypes.bool.isRequired,
   secondDeadline: PropTypes.number.isRequired,
   groupId: PropTypes.string,
-  links: PropTypes.object
+  links: PropTypes.object,
+  locale: PropTypes.string.isRequired
 };
 
 export default withLinks(AdminAssignmentTableRow);
diff --git a/src/components/Assignments/Assignment/AssignmentStatusIcon/AssignmentStatusIcon.js b/src/components/Assignments/Assignment/AssignmentStatusIcon/AssignmentStatusIcon.js
index 1f7bfe5c9..d7352054b 100644
--- a/src/components/Assignments/Assignment/AssignmentStatusIcon/AssignmentStatusIcon.js
+++ b/src/components/Assignments/Assignment/AssignmentStatusIcon/AssignmentStatusIcon.js
@@ -39,6 +39,7 @@ const AssignmentStatusIcon = ({ id, status, accepted = false }) => {
       return (
         <Status
           id={id}
+          accepted={accepted}
           icon={<Icon name="thumbs-o-down" className="text-red" />}
           message={
             <FormattedMessage
diff --git a/src/components/Assignments/Assignment/AssignmentTableRow/AssignmentTableRow.js b/src/components/Assignments/Assignment/AssignmentTableRow/AssignmentTableRow.js
index 89c216519..ac6b6a90b 100644
--- a/src/components/Assignments/Assignment/AssignmentTableRow/AssignmentTableRow.js
+++ b/src/components/Assignments/Assignment/AssignmentTableRow/AssignmentTableRow.js
@@ -5,6 +5,7 @@ import AssignmentStatusIcon from '../AssignmentStatusIcon/AssignmentStatusIcon';
 import { FormattedDate, FormattedTime } from 'react-intl';
 
 import withLinks from '../../../../hoc/withLinks';
+import { getLocalizedName } from '../../../../helpers/getLocalizedData';
 import { MaybeBonusAssignmentIcon } from '../../../icons';
 
 const AssignmentTableRow = ({
@@ -13,6 +14,7 @@ const AssignmentTableRow = ({
     id,
     name,
     group,
+    localizedTexts,
     allowSecondDeadline,
     firstDeadline,
     secondDeadline,
@@ -21,11 +23,12 @@ const AssignmentTableRow = ({
   },
   status,
   userId,
+  locale,
   links: {
     ASSIGNMENT_DETAIL_URI_FACTORY,
     ASSIGNMENT_DETAIL_SPECIFIC_USER_URI_FACTORY
   }
-}) => (
+}) =>
   <tr>
     <td className="text-center">
       <AssignmentStatusIcon id={id} status={status} accepted={accepted} />
@@ -39,37 +42,43 @@ const AssignmentTableRow = ({
             : ASSIGNMENT_DETAIL_URI_FACTORY(id)
         }
       >
-        {name}
+        {getLocalizedName({ name, localizedTexts }, locale)}
       </Link>
     </td>
-    {showGroup && <td>{group}</td>}
+    {showGroup &&
+      <td>
+        {group}
+      </td>}
     <td>
-      <FormattedDate value={new Date(firstDeadline * 1000)} />{', '}
+      <FormattedDate value={new Date(firstDeadline * 1000)} />
+      {', '}
       <FormattedTime value={new Date(firstDeadline * 1000)} />
     </td>
     <td>
       {allowSecondDeadline
         ? <span>
-            <FormattedDate value={new Date(secondDeadline * 1000)} />{', '}
+            <FormattedDate value={new Date(secondDeadline * 1000)} />
+            {', '}
             <FormattedTime value={new Date(secondDeadline * 1000)} />
           </span>
         : <span>-</span>}
     </td>
-  </tr>
-);
+  </tr>;
 
 AssignmentTableRow.propTypes = {
   showGroup: PropTypes.bool,
   item: PropTypes.shape({
     id: PropTypes.any.isRequired,
     name: PropTypes.string.isRequired,
+    localizedTexts: PropTypes.array.isRequired,
     firstDeadline: PropTypes.number.isRequired,
     secondDeadline: PropTypes.number.isRequired,
     groupId: PropTypes.string
   }),
   status: PropTypes.string,
   userId: PropTypes.string,
-  links: PropTypes.object
+  links: PropTypes.object,
+  locale: PropTypes.string.isRequired
 };
 
 export default withLinks(AssignmentTableRow);
diff --git a/src/components/Assignments/Assignment/AssignmentsTable/AssignmentsTable.js b/src/components/Assignments/Assignment/AssignmentsTable/AssignmentsTable.js
index 242d78827..6959343dd 100644
--- a/src/components/Assignments/Assignment/AssignmentsTable/AssignmentsTable.js
+++ b/src/components/Assignments/Assignment/AssignmentsTable/AssignmentsTable.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { List } from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { Table } from 'react-bootstrap';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage, injectIntl } from 'react-intl';
 
 import {
   isReady,
@@ -48,7 +48,8 @@ const AssignmentsTable = ({
   assignments = List(),
   statuses = [],
   showGroup = true,
-  userId = null
+  userId = null,
+  intl: { locale }
 }) =>
   <Table hover>
     <thead>
@@ -97,6 +98,7 @@ const AssignmentsTable = ({
             userId={userId}
             showGroup={showGroup}
             status={statuses[assignment.id]}
+            locale={locale}
           />
         )}
     </tbody>
@@ -106,7 +108,8 @@ AssignmentsTable.propTypes = {
   assignments: ImmutablePropTypes.list.isRequired,
   showGroup: PropTypes.bool,
   statuses: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
-  userId: PropTypes.string
+  userId: PropTypes.string,
+  intl: PropTypes.shape({ locale: PropTypes.string.isRequired }).isRequired
 };
 
-export default AssignmentsTable;
+export default injectIntl(AssignmentsTable);
diff --git a/src/components/Assignments/SubmissionsTable/FailedSubmissionTableRow.js b/src/components/Assignments/SubmissionsTable/FailedSubmissionTableRow.js
index 39676fb9a..9aaa4cbd6 100644
--- a/src/components/Assignments/SubmissionsTable/FailedSubmissionTableRow.js
+++ b/src/components/Assignments/SubmissionsTable/FailedSubmissionTableRow.js
@@ -15,10 +15,13 @@ const FailedSubmissionTableRow = ({
   note,
   submittedAt,
   maxPoints,
-  evaluation: { score, points, bonusPoints }
-}) => (
+  evaluation: { score, points, bonusPoints },
+  accepted
+}) =>
   <tr>
-    <td><AssignmentStatusIcon id={link} status="failed" /></td>
+    <td>
+      <AssignmentStatusIcon id={link} status="failed" accepted={accepted} />
+    </td>
     <td>
       <FormattedDate value={submittedAt * 1000} />
       &nbsp;
@@ -49,8 +52,7 @@ const FailedSubmissionTableRow = ({
         />
       </Link>
     </td>
-  </tr>
-);
+  </tr>;
 
 FailedSubmissionTableRow.propTypes = {
   link: PropTypes.string.isRequired,
@@ -60,7 +62,8 @@ FailedSubmissionTableRow.propTypes = {
   evaluation: PropTypes.shape({
     score: PropTypes.number.isRequired,
     points: PropTypes.number.isRequired
-  }).isRequired
+  }).isRequired,
+  accepted: PropTypes.bool
 };
 
 export default FailedSubmissionTableRow;
diff --git a/src/components/Exercises/ExerciseDetail/ExerciseDetail.js b/src/components/Exercises/ExerciseDetail/ExerciseDetail.js
index 697c578b3..14249f93a 100644
--- a/src/components/Exercises/ExerciseDetail/ExerciseDetail.js
+++ b/src/components/Exercises/ExerciseDetail/ExerciseDetail.js
@@ -17,6 +17,10 @@ import UsersNameContainer from '../../../containers/UsersNameContainer';
 import GroupsNameContainer from '../../../containers/GroupsNameContainer';
 import styles from './ExerciseDetail.less';
 import { MaybeSucceededIcon } from '../../icons';
+import {
+  getLocalizedName,
+  getLocalizedDescription
+} from '../../../helpers/getLocalizedData';
 
 const ExerciseDetail = ({
   id,
@@ -33,9 +37,10 @@ const ExerciseDetail = ({
   runtimeEnvironments,
   isPublic,
   isLocked,
+  locale,
   links: { EXERCISE_URI_FACTORY }
-}) => (
-  <Box title={name} noPadding>
+}) =>
+  <Box title={getLocalizedName({ name, localizedTexts }, locale)} noPadding>
     <Table>
       <tbody>
         <tr>
@@ -57,20 +62,18 @@ const ExerciseDetail = ({
             />
           </th>
           <td>
-            {groupsIds.length > 0 ? (
-              groupsIds.map((groupId, i) => (
-                <div key={i}>
-                  <GroupsNameContainer groupId={groupId} />
-                </div>
-              ))
-            ) : (
-              <i>
-                <FormattedMessage
-                  id="app.exercise.publicGroup"
-                  defaultMessage="Public"
-                />
-              </i>
-            )}
+            {groupsIds.length > 0
+              ? groupsIds.map((groupId, i) =>
+                  <div key={i}>
+                    <GroupsNameContainer groupId={groupId} />
+                  </div>
+                )
+              : <i>
+                  <FormattedMessage
+                    id="app.exercise.publicGroup"
+                    defaultMessage="Public"
+                  />
+                </i>}
           </td>
         </tr>
         <tr>
@@ -92,7 +95,12 @@ const ExerciseDetail = ({
             />
           </th>
           <td>
-            <ReactMarkdown source={description} />
+            <ReactMarkdown
+              source={getLocalizedDescription(
+                { description, localizedTexts },
+                locale
+              )}
+            />
           </td>
         </tr>
         <tr>
@@ -130,7 +138,7 @@ const ExerciseDetail = ({
             v<FormattedNumber value={version} />
           </td>
         </tr>
-        {forkedFrom && (
+        {forkedFrom &&
           <tr>
             <th>
               <FormattedMessage
@@ -145,8 +153,7 @@ const ExerciseDetail = ({
                 )
               </Link>
             </td>
-          </tr>
-        )}
+          </tr>}
         <tr>
           <th>
             <FormattedMessage
@@ -155,11 +162,11 @@ const ExerciseDetail = ({
             />
           </th>
           <td>
-            {runtimeEnvironments.map(({ id, name }) => (
+            {runtimeEnvironments.map(({ id, name }) =>
               <Label key={id} className={styles.environment}>
                 {name}
               </Label>
-            ))}
+            )}
           </td>
         </tr>
         <tr>
@@ -186,8 +193,7 @@ const ExerciseDetail = ({
         </tr>
       </tbody>
     </Table>
-  </Box>
-);
+  </Box>;
 
 ExerciseDetail.propTypes = {
   id: PropTypes.string.isRequired,
@@ -204,6 +210,7 @@ ExerciseDetail.propTypes = {
   runtimeEnvironments: PropTypes.array.isRequired,
   isPublic: PropTypes.bool.isRequired,
   isLocked: PropTypes.bool.isRequired,
+  locale: PropTypes.string.isRequired,
   links: PropTypes.object
 };
 
diff --git a/src/components/Exercises/ExercisesList/ExercisesList.js b/src/components/Exercises/ExercisesList/ExercisesList.js
index 331ce8c3e..612360fe5 100644
--- a/src/components/Exercises/ExercisesList/ExercisesList.js
+++ b/src/components/Exercises/ExercisesList/ExercisesList.js
@@ -5,7 +5,12 @@ import { injectIntl, FormattedMessage } from 'react-intl';
 
 import ExercisesListItem from '../ExercisesListItem';
 
-const ExercisesList = ({ exercises = [], createActions, intl, ...rest }) =>
+const ExercisesList = ({
+  exercises = [],
+  createActions,
+  intl: { locale },
+  ...rest
+}) =>
   <Table hover>
     <thead>
       <tr>
@@ -44,13 +49,13 @@ const ExercisesList = ({ exercises = [], createActions, intl, ...rest }) =>
         .filter(e => e !== null)
         .sort(
           (a, b) =>
-            a.name.localeCompare(b.name, intl.locale) ||
-            b.createdAt - a.createdAt
+            a.name.localeCompare(b.name, locale) || b.createdAt - a.createdAt
         )
         .map(exercise =>
           <ExercisesListItem
             {...exercise}
             createActions={createActions}
+            locale={locale}
             key={exercise.id}
           />
         )}
diff --git a/src/components/Exercises/ExercisesListItem/ExercisesListItem.js b/src/components/Exercises/ExercisesListItem/ExercisesListItem.js
index 06f5aa6ad..9f2a434d2 100644
--- a/src/components/Exercises/ExercisesListItem/ExercisesListItem.js
+++ b/src/components/Exercises/ExercisesListItem/ExercisesListItem.js
@@ -8,6 +8,7 @@ import GroupsNameContainer from '../../../containers/GroupsNameContainer';
 import { Link } from 'react-router';
 
 import withLinks from '../../../hoc/withLinks';
+import { getLocalizedName } from '../../../helpers/getLocalizedData';
 import { MaybeLockedExerciseIcon } from '../../icons';
 
 const ExercisesListItem = ({
@@ -16,11 +17,13 @@ const ExercisesListItem = ({
   difficulty,
   authorId,
   groupsIds = [],
+  localizedTexts,
   createdAt,
   isLocked,
   createActions,
+  locale,
   links: { EXERCISE_URI_FACTORY }
-}) => (
+}) =>
   <tr>
     <td className="text-center">
       <Icon name="code" />
@@ -28,27 +31,27 @@ const ExercisesListItem = ({
     <td>
       <MaybeLockedExerciseIcon id={id} isLocked={isLocked} />
       <strong>
-        <Link to={EXERCISE_URI_FACTORY(id)}>{name}</Link>
+        <Link to={EXERCISE_URI_FACTORY(id)}>
+          {getLocalizedName({ name, localizedTexts }, locale)}
+        </Link>
       </strong>
     </td>
     <td>
       <UsersNameContainer userId={authorId} />
     </td>
     <td>
-      {groupsIds.length > 0 ? (
-        groupsIds.map((groupId, i) => (
-          <div key={i}>
-            <GroupsNameContainer groupId={groupId} />
-          </div>
-        ))
-      ) : (
-        <i>
-          <FormattedMessage
-            id="app.exercisesListItem.group.public"
-            defaultMessage="Public"
-          />
-        </i>
-      )}
+      {groupsIds.length > 0
+        ? groupsIds.map((groupId, i) =>
+            <div key={i}>
+              <GroupsNameContainer groupId={groupId} />
+            </div>
+          )
+        : <i>
+            <FormattedMessage
+              id="app.exercisesListItem.group.public"
+              defaultMessage="Public"
+            />
+          </i>}
     </td>
     <td>
       <DifficultyIcon difficulty={difficulty} />
@@ -57,9 +60,11 @@ const ExercisesListItem = ({
       <FormattedDate value={createdAt * 1000} />{' '}
       <FormattedTime value={createdAt * 1000} />
     </td>
-    {createActions && <td className="text-right">{createActions(id)}</td>}
-  </tr>
-);
+    {createActions &&
+      <td className="text-right">
+        {createActions(id)}
+      </td>}
+  </tr>;
 
 ExercisesListItem.propTypes = {
   id: PropTypes.string.isRequired,
@@ -69,7 +74,9 @@ ExercisesListItem.propTypes = {
   difficulty: PropTypes.string.isRequired,
   createdAt: PropTypes.number.isRequired,
   isLocked: PropTypes.bool.isRequired,
+  localizedTexts: PropTypes.array.isRequired,
   createActions: PropTypes.func,
+  locale: PropTypes.string.isRequired,
   links: PropTypes.object
 };
 
diff --git a/src/components/Exercises/ExercisesName/ExercisesName.js b/src/components/Exercises/ExercisesName/ExercisesName.js
index 000173507..736ce29c4 100644
--- a/src/components/Exercises/ExercisesName/ExercisesName.js
+++ b/src/components/Exercises/ExercisesName/ExercisesName.js
@@ -3,31 +3,38 @@ import PropTypes from 'prop-types';
 import { Link } from 'react-router';
 
 import withLinks from '../../../hoc/withLinks';
+import { getLocalizedName } from '../../../helpers/getLocalizedData';
+
 import { MaybeLockedExerciseIcon } from '../../icons';
 
 const ExercisesName = ({
   id,
   name,
+  localizedTexts,
   isLocked,
   noLink,
+  locale,
   links: { EXERCISE_URI_FACTORY }
-}) => (
+}) =>
   <span>
     <MaybeLockedExerciseIcon id={id} isLocked={isLocked} />
-    {noLink ? (
-      <span>{name}</span>
-    ) : (
-      <Link to={EXERCISE_URI_FACTORY(id)}>{name}</Link>
-    )}
-  </span>
-);
+    {noLink
+      ? <span>
+          {getLocalizedName({ name, localizedTexts }, locale)}
+        </span>
+      : <Link to={EXERCISE_URI_FACTORY(id)}>
+          {getLocalizedName({ name, localizedTexts }, locale)}
+        </Link>}
+  </span>;
 
 ExercisesName.propTypes = {
   id: PropTypes.string.isRequired,
   name: PropTypes.string.isRequired,
+  localizedTexts: PropTypes.array.isRequired,
   isLocked: PropTypes.bool.isRequired,
   noLink: PropTypes.bool,
-  links: PropTypes.object
+  links: PropTypes.object,
+  locale: PropTypes.string.isRequired
 };
 
 export default withLinks(ExercisesName);
diff --git a/src/components/Exercises/ExercisesSimpleList/ExercisesSimpleList.js b/src/components/Exercises/ExercisesSimpleList/ExercisesSimpleList.js
index 96e568de8..3e3a455b0 100644
--- a/src/components/Exercises/ExercisesSimpleList/ExercisesSimpleList.js
+++ b/src/components/Exercises/ExercisesSimpleList/ExercisesSimpleList.js
@@ -5,7 +5,12 @@ import PropTypes from 'prop-types';
 
 import GroupExercisesListItem from '../ExercisesSimpleListItem';
 
-const ExercisesSimpleList = ({ exercises, createActions, intl, ...rest }) =>
+const ExercisesSimpleList = ({
+  exercises,
+  createActions,
+  intl: { locale },
+  ...rest
+}) =>
   <Table>
     <thead>
       <tr>
@@ -33,7 +38,7 @@ const ExercisesSimpleList = ({ exercises, createActions, intl, ...rest }) =>
     <tbody>
       {exercises
         .sort((a, b) => {
-          var tmp = a.name.localeCompare(b.name, intl.locale);
+          var tmp = a.name.localeCompare(b.name, locale);
           if (tmp === 0) {
             return b.createdAt - a.createdAt;
           } else {
@@ -44,6 +49,7 @@ const ExercisesSimpleList = ({ exercises, createActions, intl, ...rest }) =>
           <GroupExercisesListItem
             {...exercise}
             createActions={createActions}
+            locale={locale}
             key={exercise.id}
           />
         )}
diff --git a/src/components/Exercises/ExercisesSimpleListItem/ExercisesSimpleListItem.js b/src/components/Exercises/ExercisesSimpleListItem/ExercisesSimpleListItem.js
index 9012c45ea..e165ef199 100644
--- a/src/components/Exercises/ExercisesSimpleListItem/ExercisesSimpleListItem.js
+++ b/src/components/Exercises/ExercisesSimpleListItem/ExercisesSimpleListItem.js
@@ -5,6 +5,7 @@ import UsersNameContainer from '../../../containers/UsersNameContainer';
 import { Link } from 'react-router';
 
 import withLinks from '../../../hoc/withLinks';
+import { getLocalizedName } from '../../../helpers/getLocalizedData';
 import { MaybeLockedExerciseIcon } from '../../icons';
 
 const ExercisesSimpleListItem = ({
@@ -13,14 +14,18 @@ const ExercisesSimpleListItem = ({
   difficulty,
   authorId,
   isLocked,
+  localizedTexts,
   createActions,
+  locale,
   links: { EXERCISE_URI_FACTORY }
-}) => (
+}) =>
   <tr>
     <td>
       <MaybeLockedExerciseIcon id={id} isLocked={isLocked} />
       <strong>
-        <Link to={EXERCISE_URI_FACTORY(id)}>{name}</Link>
+        <Link to={EXERCISE_URI_FACTORY(id)}>
+          {getLocalizedName({ name, localizedTexts }, locale)}
+        </Link>
       </strong>
     </td>
     <td>
@@ -29,11 +34,11 @@ const ExercisesSimpleListItem = ({
     <td>
       <DifficultyIcon difficulty={difficulty} />
     </td>
-    {createActions && (
-      <td className="text-right">{createActions(id, isLocked)}</td>
-    )}
-  </tr>
-);
+    {createActions &&
+      <td className="text-right">
+        {createActions(id, isLocked)}
+      </td>}
+  </tr>;
 
 ExercisesSimpleListItem.propTypes = {
   id: PropTypes.string.isRequired,
@@ -41,7 +46,9 @@ ExercisesSimpleListItem.propTypes = {
   name: PropTypes.string.isRequired,
   difficulty: PropTypes.string.isRequired,
   isLocked: PropTypes.bool.isRequired,
+  localizedTexts: PropTypes.array.isRequired,
   createActions: PropTypes.func,
+  locale: PropTypes.string.isRequired,
   links: PropTypes.object
 };
 
diff --git a/src/components/Exercises/ForkExerciseButton/FailedForkExerciseButton.js b/src/components/Exercises/ForkExerciseButton/FailedForkExerciseButton.js
deleted file mode 100644
index f15b476e8..000000000
--- a/src/components/Exercises/ForkExerciseButton/FailedForkExerciseButton.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { FormattedMessage } from 'react-intl';
-import Button from '../../widgets/FlatButton';
-import { FailedIcon } from '../../icons';
-
-const FailedForkExerciseButton = ({ onClick, ...props }) => (
-  <Button
-    bsStyle="danger"
-    bsSize="sm"
-    className="btn-flat"
-    onClick={onClick}
-    {...props}
-  >
-    <FailedIcon />
-    {' '}
-    <FormattedMessage
-      id="app.forkExerciseButton.failed"
-      defaultMessage="Try forking the exercise again"
-    />
-  </Button>
-);
-
-FailedForkExerciseButton.propTypes = {
-  onClick: PropTypes.func.isRequired
-};
-
-export default FailedForkExerciseButton;
diff --git a/src/components/Exercises/ForkExerciseButton/ForkExerciseButton.js b/src/components/Exercises/ForkExerciseButton/ForkExerciseButton.js
deleted file mode 100644
index 8d1522312..000000000
--- a/src/components/Exercises/ForkExerciseButton/ForkExerciseButton.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { FormattedMessage } from 'react-intl';
-import Button from '../../widgets/FlatButton';
-import Icon from 'react-fontawesome';
-import Confirm from '../../forms/Confirm';
-
-const ForkExerciseButton = ({ forkId, onClick, ...props }) => (
-  <Confirm
-    id={forkId}
-    onConfirmed={onClick}
-    question={
-      <FormattedMessage
-        id="app.forkExerciseButton.confirmation"
-        defaultMessage="Do you really want to fork this exercise?"
-      />
-    }
-  >
-    <Button
-      bsStyle="default"
-      bsSize="sm"
-      className="btn-flat"
-      onClick={onClick}
-      {...props}
-    >
-      <Icon name="code-fork" />
-      {' '}
-      <FormattedMessage
-        id="app.forkExerciseButton.fork"
-        defaultMessage="Fork the exercise"
-      />
-    </Button>
-  </Confirm>
-);
-
-ForkExerciseButton.propTypes = {
-  forkId: PropTypes.string.isRequired,
-  onClick: PropTypes.func.isRequired
-};
-
-export default ForkExerciseButton;
diff --git a/src/components/Exercises/ForkExerciseButton/PendingForkExerciseButton.js b/src/components/Exercises/ForkExerciseButton/PendingForkExerciseButton.js
deleted file mode 100644
index bfd1a5461..000000000
--- a/src/components/Exercises/ForkExerciseButton/PendingForkExerciseButton.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import React from 'react';
-import { FormattedMessage } from 'react-intl';
-import Button from '../../widgets/FlatButton';
-import { LoadingIcon } from '../../icons';
-
-const PendingForkExerciseButton = props => (
-  <Button
-    bsStyle="default"
-    bsSize="sm"
-    className="btn-flat"
-    disabled
-    {...props}
-  >
-    <LoadingIcon />
-    {' '}
-    <FormattedMessage
-      id="app.forkExerciseButton.loading"
-      defaultMessage="Forking ..."
-    />
-  </Button>
-);
-
-export default PendingForkExerciseButton;
diff --git a/src/components/Exercises/ForkExerciseButton/SuccessfulForkExerciseButton.js b/src/components/Exercises/ForkExerciseButton/SuccessfulForkExerciseButton.js
deleted file mode 100644
index 82d034f34..000000000
--- a/src/components/Exercises/ForkExerciseButton/SuccessfulForkExerciseButton.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { FormattedMessage } from 'react-intl';
-import Button from '../../widgets/FlatButton';
-import { SuccessIcon } from '../../icons';
-
-const SuccessfulForkExerciseButton = ({ onClick, ...props }) => (
-  <Button
-    bsStyle="success"
-    bsSize="sm"
-    className="btn-flat"
-    onClick={onClick}
-    {...props}
-  >
-    <SuccessIcon />
-    {' '}
-    <FormattedMessage
-      id="app.forkExerciseButton.success"
-      defaultMessage="Show the forked exercise"
-    />
-  </Button>
-);
-
-SuccessfulForkExerciseButton.propTypes = {
-  onClick: PropTypes.func.isRequired
-};
-
-export default SuccessfulForkExerciseButton;
diff --git a/src/components/Exercises/ForkExerciseButton/index.js b/src/components/Exercises/ForkExerciseButton/index.js
deleted file mode 100644
index 8ca030344..000000000
--- a/src/components/Exercises/ForkExerciseButton/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export default from './ForkExerciseButton';
-export PendingForkExerciseButton from './PendingForkExerciseButton';
-export FailedForkExerciseButton from './FailedForkExerciseButton';
-export SuccessfulForkExerciseButton from './SuccessfulForkExerciseButton';
diff --git a/src/pages/Group/Group.css b/src/components/Groups/HierarchyLine/HierarchyLine.css
similarity index 65%
rename from src/pages/Group/Group.css
rename to src/components/Groups/HierarchyLine/HierarchyLine.css
index e94204ca0..0c6d3c3e3 100644
--- a/src/pages/Group/Group.css
+++ b/src/components/Groups/HierarchyLine/HierarchyLine.css
@@ -4,3 +4,8 @@
   border-color: #f5f5f5;
   color: grey;
 }
+
+.slashStyle {
+  margin: 0 5px;
+  color: #aaa;
+}
diff --git a/src/components/Groups/HierarchyLine/HierarchyLine.js b/src/components/Groups/HierarchyLine/HierarchyLine.js
new file mode 100644
index 000000000..53f70b2ef
--- /dev/null
+++ b/src/components/Groups/HierarchyLine/HierarchyLine.js
@@ -0,0 +1,26 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Well } from 'react-bootstrap';
+import GroupsNameContainer from '../../../containers/GroupsNameContainer';
+
+import './HierarchyLine.css';
+
+const HierarchyLine = ({ groupId, parentGroupsIds }) =>
+  <Well bsSize="sm" className="groupParents">
+    {parentGroupsIds.map(
+      (groupId, i) =>
+        i !== 0 &&
+        <span key={i}>
+          <GroupsNameContainer groupId={groupId} />{' '}
+          <span className="slashStyle">/</span>
+        </span>
+    )}
+    <GroupsNameContainer groupId={groupId} noLink />
+  </Well>;
+
+HierarchyLine.propTypes = {
+  groupId: PropTypes.string.isRequired,
+  parentGroupsIds: PropTypes.array
+};
+
+export default HierarchyLine;
diff --git a/src/components/Groups/HierarchyLine/index.js b/src/components/Groups/HierarchyLine/index.js
new file mode 100644
index 000000000..a8016329c
--- /dev/null
+++ b/src/components/Groups/HierarchyLine/index.js
@@ -0,0 +1 @@
+export default from './HierarchyLine';
diff --git a/src/components/Groups/ResultsTable/ResultsTable.js b/src/components/Groups/ResultsTable/ResultsTable.js
index 404aa439f..b7d11b20e 100644
--- a/src/components/Groups/ResultsTable/ResultsTable.js
+++ b/src/components/Groups/ResultsTable/ResultsTable.js
@@ -3,12 +3,13 @@ import PropTypes from 'prop-types';
 import { List } from 'immutable';
 import { Table } from 'react-bootstrap';
 import { Link } from 'react-router';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage, injectIntl } from 'react-intl';
 
 import ResultsTableRow from './ResultsTableRow';
 import LoadingResultsTableRow from './LoadingResultsTableRow';
 import NoResultsAvailableRow from './NoResultsAvailableRow';
 import withLinks from '../../../hoc/withLinks';
+import { getLocalizedName } from '../../../helpers/getLocalizedData';
 import ResourceRenderer from '../../helpers/ResourceRenderer';
 import styles from './ResultsTable.less';
 
@@ -16,6 +17,7 @@ const ResultsTable = ({
   assignments = List(),
   users = [],
   submissions,
+  intl: { locale },
   links: { SUPERVISOR_STATS_URI_FACTORY }
 }) => {
   const assignmentsArray = assignments.sort(
@@ -32,7 +34,7 @@ const ResultsTable = ({
               <div className={styles.verticalText}>
                 <div className={styles.verticalTextInner}>
                   <Link to={SUPERVISOR_STATS_URI_FACTORY(assignment.id)}>
-                    {assignment.name}
+                    {getLocalizedName(assignment, locale)}
                   </Link>
                 </div>
               </div>
@@ -77,7 +79,8 @@ ResultsTable.propTypes = {
   assignments: PropTypes.array.isRequired,
   users: PropTypes.array.isRequired,
   submissions: PropTypes.object.isRequired,
-  links: PropTypes.object
+  links: PropTypes.object,
+  intl: PropTypes.shape({ locale: PropTypes.string.isRequired }).isRequired
 };
 
-export default withLinks(ResultsTable);
+export default injectIntl(withLinks(ResultsTable));
diff --git a/src/components/Submissions/TestResults/TestResults.js b/src/components/Submissions/TestResults/TestResults.js
index 9e6430073..26fbec757 100644
--- a/src/components/Submissions/TestResults/TestResults.js
+++ b/src/components/Submissions/TestResults/TestResults.js
@@ -15,6 +15,7 @@ const TestResults = ({ evaluation, runtimeEnvironmentId }) =>
     noPadding={true}
     collapsable={true}
     isOpen={true}
+    unlimitedHeight
   >
     <TestResultsTable
       results={evaluation.testResults}
diff --git a/src/components/forms/EditAssignmentForm/EditAssignmentForm.js b/src/components/forms/EditAssignmentForm/EditAssignmentForm.js
index 4182a261f..e71055e58 100644
--- a/src/components/forms/EditAssignmentForm/EditAssignmentForm.js
+++ b/src/components/forms/EditAssignmentForm/EditAssignmentForm.js
@@ -1,26 +1,17 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { canUseDOM } from 'exenv';
 import { reduxForm, Field, FieldArray, touch } from 'redux-form';
-import { FormattedHTMLMessage, FormattedMessage } from 'react-intl';
+import { FormattedMessage, injectIntl } from 'react-intl';
 import { Alert, HelpBlock } from 'react-bootstrap';
 import isNumeric from 'validator/lib/isNumeric';
 
 import FormBox from '../../widgets/FormBox';
-import {
-  DatetimeField,
-  TextField,
-  CheckboxField,
-  SourceCodeField
-} from '../Fields';
+import { DatetimeField, TextField, CheckboxField } from '../Fields';
 import LocalizedTextsFormField from '../LocalizedTextsFormField';
 import SubmitButton from '../SubmitButton';
 
 import { validateAssignment } from '../../../redux/modules/assignments';
-
-if (canUseDOM) {
-  require('codemirror/mode/yaml/yaml');
-}
+import { getLocalizedName } from '../../../helpers/getLocalizedData';
 
 const EditAssignmentForm = ({
   initialValues: assignment,
@@ -31,7 +22,8 @@ const EditAssignmentForm = ({
   submitSucceeded: hasSucceeded,
   asyncValidating,
   invalid,
-  formValues: { firstDeadline, allowSecondDeadline, localizedTexts } = {}
+  formValues: { firstDeadline, allowSecondDeadline, localizedTexts } = {},
+  intl: { locale }
 }) =>
   <div>
     <FormBox
@@ -39,7 +31,7 @@ const EditAssignmentForm = ({
         <FormattedMessage
           id="app.editAssignmentForm.title"
           defaultMessage="Edit assignment {name}"
-          values={{ name: assignment.name }}
+          values={{ name: getLocalizedName(assignment, locale) }}
         />
       }
       successful={hasSucceeded}
@@ -88,53 +80,12 @@ const EditAssignmentForm = ({
           />
         </Alert>}
 
-      <Field
-        name="name"
-        component={TextField}
-        label={
-          <FormattedMessage
-            id="app.editAssignmentForm.name"
-            defaultMessage="Assignment default name:"
-          />
-        }
-      />
-
-      <Field
-        name="isPublic"
-        component={CheckboxField}
-        onOff
-        label={
-          <FormattedMessage
-            id="app.editAssignmentForm.isPublic"
-            defaultMessage="Visible to students"
-          />
-        }
-      />
-
       <FieldArray
         name="localizedTexts"
         localizedTexts={localizedTexts}
         component={LocalizedTextsFormField}
       />
 
-      <Field
-        name="scoreConfig"
-        component={SourceCodeField}
-        mode="yaml"
-        label={
-          <FormattedMessage
-            id="app.editAssignmentForm.scoreConfig"
-            defaultMessage="Score configuration:"
-          />
-        }
-      />
-      <HelpBlock>
-        <FormattedHTMLMessage
-          id="app.editAssignmentForm.moreAboutScoreConfig"
-          defaultMessage="Read more about <a href='https://github.com/ReCodEx/wiki/wiki/Assignments#scoring'>score configuration</a> syntax."
-        />
-      </HelpBlock>
-
       <Field
         name="firstDeadline"
         component={DatetimeField}
@@ -250,6 +201,18 @@ const EditAssignmentForm = ({
           />
         }
       />
+
+      <Field
+        name="isPublic"
+        component={CheckboxField}
+        onOff
+        label={
+          <FormattedMessage
+            id="app.editAssignmentForm.isPublic"
+            defaultMessage="Visible to students"
+          />
+        }
+      />
     </FormBox>
   </div>;
 
@@ -270,7 +233,8 @@ EditAssignmentForm.propTypes = {
       PropTypes.string
     ]),
     localizedTexts: PropTypes.array
-  })
+  }),
+  intl: PropTypes.shape({ locale: PropTypes.string.isRequired }).isRequired
 };
 
 const isNonNegativeInteger = n =>
@@ -296,15 +260,6 @@ const validate = ({
 }) => {
   const errors = {};
 
-  if (!name) {
-    errors['name'] = (
-      <FormattedMessage
-        id="app.editAssignmentForm.validation.emptyName"
-        defaultMessage="Please fill the name of the assignment."
-      />
-    );
-  }
-
   if (localizedTexts.length < 1) {
     errors['_error'] = (
       <FormattedMessage
@@ -325,6 +280,15 @@ const validate = ({
         />
       );
     } else {
+      if (!localizedTexts[i].name) {
+        localeErrors['name'] = (
+          <FormattedMessage
+            id="app.editAssignmentForm.validation.emptyName"
+            defaultMessage="Please fill the name of the assignment."
+          />
+        );
+      }
+
       if (!localizedTexts[i].locale) {
         localeErrors['locale'] = (
           <FormattedMessage
@@ -477,8 +441,10 @@ const asyncValidate = (values, dispatch, { assignment: { id, version } }) =>
       .catch(errors => reject(errors))
   );
 
-export default reduxForm({
-  form: 'editAssignment',
-  validate,
-  asyncValidate
-})(EditAssignmentForm);
+export default injectIntl(
+  reduxForm({
+    form: 'editAssignment',
+    validate,
+    asyncValidate
+  })(EditAssignmentForm)
+);
diff --git a/src/components/forms/EditExerciseConfigForm/EditExerciseConfigForm.js b/src/components/forms/EditExerciseConfigForm/EditExerciseConfigForm.js
index e6a8d6ed0..ab10768ce 100644
--- a/src/components/forms/EditExerciseConfigForm/EditExerciseConfigForm.js
+++ b/src/components/forms/EditExerciseConfigForm/EditExerciseConfigForm.js
@@ -25,6 +25,7 @@ class EditExerciseConfigForm extends Component {
 
   componentWillReceiveProps(newProps) {
     if (this.props.exercise.id !== newProps.exercise.id) {
+      this.setState({ testConfigs: newProps.initialValues.config });
       newProps.fetchFiles();
     }
   }
@@ -36,11 +37,9 @@ class EditExerciseConfigForm extends Component {
           if (!testConfig.tests) {
             testConfig.tests = [];
           }
-          testConfig.tests = testConfig.tests.concat([
-            {
-              name: 'Test ' + (testConfig.tests.length + 1)
-            }
-          ]);
+          testConfig.tests.push({
+            name: 'Test ' + (testConfig.tests.length + 1)
+          });
           return testConfig;
         })
       };
diff --git a/src/components/forms/EditExerciseForm/EditExerciseForm.js b/src/components/forms/EditExerciseForm/EditExerciseForm.js
index ebe8320c1..c7a6c9856 100644
--- a/src/components/forms/EditExerciseForm/EditExerciseForm.js
+++ b/src/components/forms/EditExerciseForm/EditExerciseForm.js
@@ -12,12 +12,7 @@ import { Alert } from 'react-bootstrap';
 import Icon from 'react-fontawesome';
 import { LinkContainer } from 'react-router-bootstrap';
 
-import {
-  TextField,
-  SelectField,
-  CheckboxField,
-  MarkdownTextAreaField
-} from '../Fields';
+import { SelectField, CheckboxField } from '../Fields';
 
 import FormBox from '../../widgets/FormBox';
 import SubmitButton from '../SubmitButton';
@@ -25,6 +20,7 @@ import Button from '../../widgets/FlatButton';
 import LocalizedTextsFormField from '../LocalizedTextsFormField';
 import { validateExercise } from '../../../redux/modules/exercises';
 import withLinks from '../../../hoc/withLinks';
+import { getLocalizedName } from '../../../helpers/getLocalizedData';
 
 if (canUseDOM) {
   require('codemirror/mode/yaml/yaml');
@@ -55,7 +51,7 @@ const EditExerciseForm = ({
   invalid,
   asyncValidating,
   formValues: { localizedTexts } = {},
-  intl: { formatMessage },
+  intl: { formatMessage, locale },
   links: { EXERCISE_EDIT_CONFIG_URI_FACTORY }
 }) =>
   <FormBox
@@ -63,7 +59,7 @@ const EditExerciseForm = ({
       <FormattedMessage
         id="app.editExerciseForm.title"
         defaultMessage="Edit exercise {name}"
-        values={{ name: exercise.name }}
+        values={{ name: getLocalizedName(exercise, locale) }}
       />
     }
     succeeded={hasSucceeded}
@@ -126,15 +122,10 @@ const EditExerciseForm = ({
         />
       </Alert>}
 
-    <Field
-      name="name"
-      component={TextField}
-      label={
-        <FormattedMessage
-          id="app.editExerciseForm.name"
-          defaultMessage="Exercise name:"
-        />
-      }
+    <FieldArray
+      name="localizedTexts"
+      localizedTexts={localizedTexts}
+      component={LocalizedTextsFormField}
     />
 
     <Field
@@ -154,17 +145,6 @@ const EditExerciseForm = ({
       }
     />
 
-    <Field
-      name="description"
-      component={MarkdownTextAreaField}
-      label={
-        <FormattedMessage
-          id="app.editExerciseForm.description"
-          defaultMessage="Description for supervisors:"
-        />
-      }
-    />
-
     <Field
       name="isPublic"
       component={CheckboxField}
@@ -188,12 +168,6 @@ const EditExerciseForm = ({
         />
       }
     />
-
-    <FieldArray
-      name="localizedTexts"
-      localizedTexts={localizedTexts}
-      component={LocalizedTextsFormField}
-    />
   </FormBox>;
 
 EditExerciseForm.propTypes = {
@@ -216,15 +190,6 @@ EditExerciseForm.propTypes = {
 const validate = ({ name, description, difficulty, localizedTexts }) => {
   const errors = {};
 
-  if (!name) {
-    errors['name'] = (
-      <FormattedMessage
-        id="app.editExerciseForm.validation.emptyName"
-        defaultMessage="Please fill the name of the exercise."
-      />
-    );
-  }
-
   if (!difficulty) {
     errors['difficulty'] = (
       <FormattedMessage
@@ -234,15 +199,6 @@ const validate = ({ name, description, difficulty, localizedTexts }) => {
     );
   }
 
-  if (!description) {
-    errors['description'] = (
-      <FormattedMessage
-        id="app.editExerciseForm.validation.description"
-        defaultMessage="Please fill the description of the exercise."
-      />
-    );
-  }
-
   if (localizedTexts.length < 1) {
     errors['_error'] = (
       <FormattedMessage
@@ -263,6 +219,15 @@ const validate = ({ name, description, difficulty, localizedTexts }) => {
         />
       );
     } else {
+      if (!localizedTexts[i].name) {
+        localeErrors['name'] = (
+          <FormattedMessage
+            id="app.editExerciseForm.validation.emptyName"
+            defaultMessage="Please fill the name of the exercise."
+          />
+        );
+      }
+
       if (!localizedTexts[i].locale) {
         localeErrors['locale'] = (
           <FormattedMessage
@@ -280,6 +245,15 @@ const validate = ({ name, description, difficulty, localizedTexts }) => {
           />
         );
       }
+
+      if (!localizedTexts[i].description) {
+        localeErrors['description'] = (
+          <FormattedMessage
+            id="app.editExerciseForm.validation.description"
+            defaultMessage="Please fill the description of the exercise."
+          />
+        );
+      }
     }
 
     localizedTextsErrors[i] = localeErrors;
diff --git a/src/components/forms/EditScoreConfigForm/EditScoreConfigForm.js b/src/components/forms/EditScoreConfigForm/EditScoreConfigForm.js
new file mode 100644
index 000000000..bf5aa2cde
--- /dev/null
+++ b/src/components/forms/EditScoreConfigForm/EditScoreConfigForm.js
@@ -0,0 +1,94 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { canUseDOM } from 'exenv';
+import { reduxForm, Field } from 'redux-form';
+import { FormattedMessage } from 'react-intl';
+import { Alert } from 'react-bootstrap';
+
+import { SourceCodeField } from '../Fields';
+import SubmitButton from '../SubmitButton';
+
+if (canUseDOM) {
+  require('codemirror/mode/yaml/yaml');
+}
+
+const EditScoreConfigForm = ({
+  anyTouched,
+  submitting,
+  handleSubmit,
+  hasFailed = false,
+  hasSucceeded = false,
+  invalid
+}) =>
+  <div>
+    {hasFailed &&
+      <Alert bsStyle="danger">
+        <FormattedMessage
+          id="app.editScoreConfigForm.failed"
+          defaultMessage="Saving failed. Please try again later."
+        />
+      </Alert>}
+
+    <Field
+      name="scoreConfig"
+      component={SourceCodeField}
+      mode="yaml"
+      label={
+        <FormattedMessage
+          id="app.editScoreConfigForm.scoreConfig"
+          defaultMessage="Score configuration:"
+        />
+      }
+    />
+
+    <div className="text-center">
+      <SubmitButton
+        id="editEnvironmentConfig"
+        invalid={invalid}
+        submitting={submitting}
+        hasSucceeded={hasSucceeded}
+        dirty={anyTouched}
+        hasFailed={hasFailed}
+        handleSubmit={handleSubmit}
+        messages={{
+          submit: (
+            <FormattedMessage
+              id="app.editScoreConfigForm.submit"
+              defaultMessage="Change configuration"
+            />
+          ),
+          submitting: (
+            <FormattedMessage
+              id="app.editScoreConfigForm.submitting"
+              defaultMessage="Saving configuration ..."
+            />
+          ),
+          success: (
+            <FormattedMessage
+              id="app.editScoreConfigForm.success"
+              defaultMessage="Configuration was changed."
+            />
+          )
+        }}
+      />
+    </div>
+  </div>;
+
+EditScoreConfigForm.propTypes = {
+  handleSubmit: PropTypes.func.isRequired,
+  anyTouched: PropTypes.bool,
+  submitting: PropTypes.bool,
+  hasFailed: PropTypes.bool,
+  hasSucceeded: PropTypes.bool,
+  invalid: PropTypes.bool
+};
+
+const validate = () => {
+  const errors = {};
+  return errors;
+};
+
+export default reduxForm({
+  form: 'editScoreConfig',
+  validate
+})(EditScoreConfigForm);
diff --git a/src/components/forms/EditScoreConfigForm/index.js b/src/components/forms/EditScoreConfigForm/index.js
new file mode 100644
index 000000000..6373871de
--- /dev/null
+++ b/src/components/forms/EditScoreConfigForm/index.js
@@ -0,0 +1 @@
+export default from './EditScoreConfigForm';
diff --git a/src/components/forms/ForkExerciseForm/ForkExerciseForm.css b/src/components/forms/ForkExerciseForm/ForkExerciseForm.css
new file mode 100644
index 000000000..ca4e570d0
--- /dev/null
+++ b/src/components/forms/ForkExerciseForm/ForkExerciseForm.css
@@ -0,0 +1,4 @@
+.formSpace {
+  padding-left: 10px;
+  display: flex;
+}
diff --git a/src/components/forms/ForkExerciseForm/ForkExerciseForm.js b/src/components/forms/ForkExerciseForm/ForkExerciseForm.js
new file mode 100644
index 000000000..203da743e
--- /dev/null
+++ b/src/components/forms/ForkExerciseForm/ForkExerciseForm.js
@@ -0,0 +1,169 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import { injectIntl, FormattedMessage } from 'react-intl';
+import { Alert, Form } from 'react-bootstrap';
+import { connect } from 'react-redux';
+import { push } from 'react-router-redux';
+import { reduxForm, Field } from 'redux-form';
+import { SelectField } from '../Fields';
+import SubmitButton from '../SubmitButton';
+import Button from '../../../components/widgets/FlatButton';
+import { SuccessIcon } from '../../../components/icons';
+import { forkStatuses } from '../../../redux/modules/exercises';
+import { getFork } from '../../../redux/selectors/exercises';
+import ResourceRenderer from '../../helpers/ResourceRenderer';
+
+import withLinks from '../../../hoc/withLinks';
+
+import './ForkExerciseForm.css';
+
+class ForkExerciseForm extends Component {
+  viewForkedExercise() {
+    const {
+      forkedExerciseId: id,
+      push,
+      links: { EXERCISE_URI_FACTORY }
+    } = this.props;
+
+    const url = EXERCISE_URI_FACTORY(id);
+    push(url);
+  }
+
+  render() {
+    const {
+      forkStatus,
+      anyTouched,
+      submitting,
+      handleSubmit,
+      hasFailed = false,
+      hasSucceeded = false,
+      invalid,
+      groups,
+      intl
+    } = this.props;
+
+    switch (forkStatus) {
+      case forkStatuses.FULFILLED:
+        return (
+          <Button
+            bsStyle="success"
+            bsSize="sm"
+            className="btn-flat"
+            onClick={() => this.viewForkedExercise()}
+          >
+            <SuccessIcon />{' '}
+            <FormattedMessage
+              id="app.forkExerciseButton.success"
+              defaultMessage="Show the forked exercise"
+            />
+          </Button>
+        );
+      default:
+        return (
+          <div>
+            {hasFailed &&
+              <Alert bsStyle="danger">
+                <FormattedMessage
+                  id="app.forkExerciseForm.failed"
+                  defaultMessage="Saving failed. Please try again later."
+                />
+              </Alert>}
+            <Form inline className="formSpace">
+              <ResourceRenderer resource={groups.toArray()}>
+                {(...groups) =>
+                  <Field
+                    name={'groupId'}
+                    component={SelectField}
+                    label={''}
+                    options={[{ key: '', name: '_Public_' }].concat(
+                      groups
+                        .sort((a, b) =>
+                          a.name.localeCompare(b.name, intl.locale)
+                        )
+                        .filter((item, pos, arr) => arr.indexOf(item) === pos)
+                        .map(group => ({
+                          key: group.id,
+                          name: group.name
+                        }))
+                    )}
+                  />}
+              </ResourceRenderer>
+
+              <SubmitButton
+                id="forkExercise"
+                invalid={invalid}
+                submitting={submitting}
+                hasSucceeded={hasSucceeded}
+                dirty={anyTouched}
+                hasFailed={hasFailed}
+                handleSubmit={handleSubmit}
+                noIcons
+                messages={{
+                  submit: (
+                    <FormattedMessage
+                      id="app.forkExerciseForm.submit"
+                      defaultMessage="Fork exercise"
+                    />
+                  ),
+                  submitting: (
+                    <FormattedMessage
+                      id="app.forkExerciseForm.submitting"
+                      defaultMessage="Forking ..."
+                    />
+                  ),
+                  success: (
+                    <FormattedMessage
+                      id="app.forkExerciseForm.success"
+                      defaultMessage="Exercise forked"
+                    />
+                  )
+                }}
+              />
+            </Form>
+          </div>
+        );
+    }
+  }
+}
+
+ForkExerciseForm.propTypes = {
+  exerciseId: PropTypes.string.isRequired,
+  forkId: PropTypes.string.isRequired,
+  forkStatus: PropTypes.string,
+  forkedExerciseId: PropTypes.string,
+  anyTouched: PropTypes.bool,
+  submitting: PropTypes.bool,
+  hasFailed: PropTypes.bool,
+  hasSucceeded: PropTypes.bool,
+  invalid: PropTypes.bool,
+  handleSubmit: PropTypes.func.isRequired,
+  push: PropTypes.func.isRequired,
+  links: PropTypes.object,
+  groups: ImmutablePropTypes.map,
+  intl: PropTypes.shape({ locale: PropTypes.string.isRequired }).isRequired
+};
+
+const mapStateToProps = (state, { exerciseId, forkId }) => {
+  const fork = getFork(exerciseId, forkId)(state);
+  return {
+    forkStatus: fork ? fork.status : null,
+    forkedExerciseId:
+      fork && fork.status === forkStatuses.FULFILLED ? fork.exerciseId : null
+  };
+};
+
+const mapDispatchToProps = (dispatch, { exerciseId, forkId }) => ({
+  push: url => dispatch(push(url))
+});
+
+const validate = () => {};
+
+export default withLinks(
+  connect(mapStateToProps, mapDispatchToProps)(
+    reduxForm({
+      form: 'forkExercise',
+      validate
+    })(injectIntl(ForkExerciseForm))
+  )
+);
diff --git a/src/components/forms/ForkExerciseForm/index.js b/src/components/forms/ForkExerciseForm/index.js
new file mode 100644
index 000000000..f523ad8b0
--- /dev/null
+++ b/src/components/forms/ForkExerciseForm/index.js
@@ -0,0 +1 @@
+export default from './ForkExerciseForm';
diff --git a/src/components/forms/LocalizedTextsFormField/LocalizedTextFormField.js b/src/components/forms/LocalizedTextsFormField/LocalizedTextFormField.js
index 1dd34cd66..34e6606d0 100644
--- a/src/components/forms/LocalizedTextsFormField/LocalizedTextFormField.js
+++ b/src/components/forms/LocalizedTextsFormField/LocalizedTextFormField.js
@@ -2,10 +2,25 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
 import { Field } from 'redux-form';
-import { MarkdownTextAreaField, LanguageSelectField } from '../Fields';
+import {
+  MarkdownTextAreaField,
+  LanguageSelectField,
+  TextField
+} from '../Fields';
 
-const LocalizedTextFormField = ({ prefix }) => (
+const LocalizedTextFormField = ({ prefix }) =>
   <div>
+    <Field
+      name={`${prefix}.name`}
+      component={TextField}
+      label={
+        <FormattedMessage
+          id="app.editAssignmentForm.localized.name"
+          defaultMessage="Name:"
+        />
+      }
+    />
+
     <Field
       name={`${prefix}.locale`}
       component={LanguageSelectField}
@@ -27,8 +42,18 @@ const LocalizedTextFormField = ({ prefix }) => (
         />
       }
     />
-  </div>
-);
+
+    <Field
+      name={`${prefix}.description`}
+      component={MarkdownTextAreaField}
+      label={
+        <FormattedMessage
+          id="app.editAssignmentForm.description"
+          defaultMessage="Description for supervisors:"
+        />
+      }
+    />
+  </div>;
 
 LocalizedTextFormField.propTypes = {
   prefix: PropTypes.string.isRequired
diff --git a/src/components/forms/SubmitButton/SubmitButton.js b/src/components/forms/SubmitButton/SubmitButton.js
index c5d59baa1..01534e7c3 100644
--- a/src/components/forms/SubmitButton/SubmitButton.js
+++ b/src/components/forms/SubmitButton/SubmitButton.js
@@ -45,6 +45,7 @@ class SubmitButton extends Component {
       invalid,
       asyncValidating = false,
       noIcons = false,
+      disabled = false,
       messages: {
         submit: submitMsg = (
           <FormattedMessage
@@ -91,7 +92,9 @@ class SubmitButton extends Component {
             : hasFailed ? 'danger' : dirty ? 'warning' : 'success'
         }
         className="btn-flat"
-        disabled={invalid || asyncValidating !== false || submitting}
+        disabled={
+          invalid || asyncValidating !== false || submitting || disabled
+        }
       >
         {!submitting
           ? hasSucceeded
@@ -128,6 +131,7 @@ SubmitButton.propTypes = {
   asyncValidating: PropTypes.oneOfType([PropTypes.bool, PropTypes.string]),
   noIcons: PropTypes.bool,
   invalid: PropTypes.bool,
+  disabled: PropTypes.bool,
   reset: PropTypes.func,
   messages: PropTypes.shape({
     submit: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
diff --git a/src/components/helpers/SourceCodeViewer/SourceCodeViewer.js b/src/components/helpers/SourceCodeViewer/SourceCodeViewer.js
index 386d93089..3dd20c8ee 100644
--- a/src/components/helpers/SourceCodeViewer/SourceCodeViewer.js
+++ b/src/components/helpers/SourceCodeViewer/SourceCodeViewer.js
@@ -32,27 +32,24 @@ const getMode = ext => {
 };
 
 const SourceCodeViewer = (
-  { name, content = '', lineNumbers = true, height },
+  { name, content = '', lineNumbers = true },
   { userSettings: { vimMode = false, darkTheme = false } }
 ) =>
-  height
-    ? <AceEditor
-        value={content}
-        mode={getMode(name.split('.').pop())}
-        keyboardHandler={vimMode ? 'vim' : undefined}
-        theme={darkTheme ? 'monokai' : 'github'}
-        name="source-code-viewer"
-        width="100%"
-        height={`${height}px`}
-        editorProps={{ $blockScrolling: true, $autoScrollEditorIntoView: true }}
-      />
-    : null;
+  <AceEditor
+    value={content}
+    mode={getMode(name.split('.').pop())}
+    keyboardHandler={vimMode ? 'vim' : undefined}
+    theme={darkTheme ? 'monokai' : 'github'}
+    name="source-code-viewer"
+    width="100%"
+    height="100%"
+    editorProps={{ $blockScrolling: true, $autoScrollEditorIntoView: true }}
+  />;
 
 SourceCodeViewer.propTypes = {
   name: PropTypes.string.isRequired,
   content: PropTypes.string,
-  lineNumbers: PropTypes.bool,
-  height: PropTypes.number
+  lineNumbers: PropTypes.bool
 };
 
 SourceCodeViewer.contextTypes = {
diff --git a/src/containers/ExercisesNameContainer/ExercisesNameContainer.js b/src/containers/ExercisesNameContainer/ExercisesNameContainer.js
index 1dc6d9bd6..8b799a9bf 100644
--- a/src/containers/ExercisesNameContainer/ExercisesNameContainer.js
+++ b/src/containers/ExercisesNameContainer/ExercisesNameContainer.js
@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
+import { injectIntl } from 'react-intl';
 
 import { fetchExerciseIfNeeded } from '../../redux/modules/exercises';
 import { exerciseSelector } from '../../redux/selectors/exercises';
@@ -26,10 +27,11 @@ class ExercisesNameContainer extends Component {
   };
 
   render() {
-    const { exercise, noLink } = this.props;
+    const { exercise, noLink, intl: { locale } } = this.props;
     return (
       <ResourceRenderer resource={exercise} loading={<LoadingExercisesName />}>
-        {exercise => <ExercisesName {...exercise} noLink={noLink} />}
+        {exercise =>
+          <ExercisesName {...exercise} noLink={noLink} locale={locale} />}
       </ResourceRenderer>
     );
   }
@@ -38,14 +40,17 @@ class ExercisesNameContainer extends Component {
 ExercisesNameContainer.propTypes = {
   exerciseId: PropTypes.string.isRequired,
   exercise: ImmutablePropTypes.map,
-  noLink: PropTypes.bool
+  noLink: PropTypes.bool,
+  intl: PropTypes.shape({ locale: PropTypes.string.isRequired }).isRequired
 };
 
-export default connect(
-  (state, { exerciseId }) => ({
-    exercise: exerciseSelector(exerciseId)(state)
-  }),
-  (dispatch, { exerciseId }) => ({
-    loadExerciseIfNeeded: () => dispatch(fetchExerciseIfNeeded(exerciseId))
-  })
-)(ExercisesNameContainer);
+export default injectIntl(
+  connect(
+    (state, { exerciseId }) => ({
+      exercise: exerciseSelector(exerciseId)(state)
+    }),
+    (dispatch, { exerciseId }) => ({
+      loadExerciseIfNeeded: () => dispatch(fetchExerciseIfNeeded(exerciseId))
+    })
+  )(ExercisesNameContainer)
+);
diff --git a/src/containers/ForkExerciseButtonContainer/ForkExerciseButtonContainer.js b/src/containers/ForkExerciseButtonContainer/ForkExerciseButtonContainer.js
deleted file mode 100644
index 2b36ea88d..000000000
--- a/src/containers/ForkExerciseButtonContainer/ForkExerciseButtonContainer.js
+++ /dev/null
@@ -1,82 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { push } from 'react-router-redux';
-import { forkStatuses, forkExercise } from '../../redux/modules/exercises';
-import { getFork } from '../../redux/selectors/exercises';
-
-import ForkExerciseButton, {
-  PendingForkExerciseButton,
-  FailedForkExerciseButton,
-  SuccessfulForkExerciseButton
-} from '../../components/Exercises/ForkExerciseButton';
-
-import withLinks from '../../hoc/withLinks';
-
-class ForkExerciseButtonContainer extends Component {
-  viewForkedExercise() {
-    const {
-      forkedExerciseId: id,
-      push,
-      links: { EXERCISE_URI_FACTORY }
-    } = this.props;
-
-    const url = EXERCISE_URI_FACTORY(id);
-    push(url);
-  }
-
-  fork() {
-    const { fork } = this.props;
-    fork();
-  }
-
-  render() {
-    const { forkStatus, forkId } = this.props;
-
-    switch (forkStatus) {
-      case forkStatuses.PENDING:
-        return <PendingForkExerciseButton />;
-      case forkStatuses.REJECTED:
-        return <FailedForkExerciseButton onClick={this.fork} />;
-      case forkStatuses.FULFILLED:
-        return (
-          <SuccessfulForkExerciseButton
-            onClick={() => this.viewForkedExercise()}
-          />
-        );
-      default:
-        return (
-          <ForkExerciseButton onClick={() => this.fork()} forkId={forkId} />
-        );
-    }
-  }
-}
-
-ForkExerciseButtonContainer.propTypes = {
-  fork: PropTypes.func.isRequired,
-  exerciseId: PropTypes.string.isRequired,
-  forkId: PropTypes.string.isRequired,
-  forkStatus: PropTypes.string,
-  forkedExerciseId: PropTypes.string,
-  push: PropTypes.func.isRequired,
-  links: PropTypes.object
-};
-
-const mapStateToProps = (state, { exerciseId, forkId }) => {
-  const fork = getFork(exerciseId, forkId)(state);
-  return {
-    forkStatus: fork ? fork.status : null,
-    forkedExerciseId: fork && fork.status === forkStatuses.FULFILLED
-      ? fork.exerciseId
-      : null
-  };
-};
-
-const mapDispatchToProps = (dispatch, { exerciseId, forkId }) => ({
-  push: url => dispatch(push(url)),
-  fork: () => dispatch(forkExercise(exerciseId, forkId))
-});
-
-export default withLinks(
-  connect(mapStateToProps, mapDispatchToProps)(ForkExerciseButtonContainer)
-);
diff --git a/src/containers/ForkExerciseButtonContainer/index.js b/src/containers/ForkExerciseButtonContainer/index.js
deleted file mode 100644
index fe84448c9..000000000
--- a/src/containers/ForkExerciseButtonContainer/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export default from './ForkExerciseButtonContainer';
diff --git a/src/containers/GroupsNameContainer/GroupsNameContainer.js b/src/containers/GroupsNameContainer/GroupsNameContainer.js
index 04cc9a063..1da3f2f4d 100644
--- a/src/containers/GroupsNameContainer/GroupsNameContainer.js
+++ b/src/containers/GroupsNameContainer/GroupsNameContainer.js
@@ -12,17 +12,17 @@ import GroupsName, {
 
 class GroupsNameContainer extends Component {
   componentWillMount() {
-    GroupsNameContainer.loadData(this.props);
+    this.props.loadAsync();
   }
 
   componentWillReceiveProps(newProps) {
     if (this.props.groupId !== newProps.groupId) {
-      GroupsNameContainer.loadData(newProps);
+      newProps.loadAsync();
     }
   }
 
-  static loadData = ({ loadGroupIfNeeded }) => {
-    loadGroupIfNeeded();
+  static loadAsync = ({ groupId }, dispatch) => {
+    dispatch(fetchPublicGroupIfNeeded(groupId));
   };
 
   render() {
@@ -38,7 +38,8 @@ class GroupsNameContainer extends Component {
 GroupsNameContainer.propTypes = {
   groupId: PropTypes.string.isRequired,
   group: ImmutablePropTypes.map,
-  noLink: PropTypes.bool
+  noLink: PropTypes.bool,
+  loadAsync: PropTypes.func.isRequired
 };
 
 export default connect(
@@ -46,6 +47,6 @@ export default connect(
     group: publicGroupSelector(groupId)(state)
   }),
   (dispatch, { groupId }) => ({
-    loadGroupIfNeeded: () => dispatch(fetchPublicGroupIfNeeded(groupId))
+    loadAsync: () => GroupsNameContainer.loadAsync({ groupId }, dispatch)
   })
 )(GroupsNameContainer);
diff --git a/src/containers/HierarchyLineContainer/HierarchyLineContainer.js b/src/containers/HierarchyLineContainer/HierarchyLineContainer.js
new file mode 100644
index 000000000..1155592bd
--- /dev/null
+++ b/src/containers/HierarchyLineContainer/HierarchyLineContainer.js
@@ -0,0 +1,52 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import { connect } from 'react-redux';
+
+import { fetchGroupIfNeeded } from '../../redux/modules/groups';
+import { groupSelector } from '../../redux/selectors/groups';
+import ResourceRenderer from '../../components/helpers/ResourceRenderer';
+import HierarchyLine from '../../components/Groups/HierarchyLine';
+
+class HierarchyLineContainer extends Component {
+  componentWillMount() {
+    HierarchyLineContainer.loadAsync(this.props);
+  }
+
+  componentWillReceiveProps(newProps) {
+    if (this.props.groupId !== newProps.groupId) {
+      HierarchyLineContainer.loadAsync(newProps);
+    }
+  }
+
+  static loadAsync = ({ loadGroupIfNeeded }) => {
+    loadGroupIfNeeded();
+  };
+
+  render() {
+    const { group } = this.props;
+    return (
+      <ResourceRenderer resource={group}>
+        {group =>
+          <HierarchyLine
+            groupId={group.id}
+            parentGroupsIds={group.parentGroupsIds}
+          />}
+      </ResourceRenderer>
+    );
+  }
+}
+
+HierarchyLineContainer.propTypes = {
+  groupId: PropTypes.string.isRequired,
+  group: ImmutablePropTypes.map
+};
+
+export default connect(
+  (state, { groupId }) => ({
+    group: groupSelector(groupId)(state)
+  }),
+  (dispatch, { groupId }) => ({
+    loadGroupIfNeeded: () => dispatch(fetchGroupIfNeeded(groupId))
+  })
+)(HierarchyLineContainer);
diff --git a/src/containers/HierarchyLineContainer/index.js b/src/containers/HierarchyLineContainer/index.js
new file mode 100644
index 000000000..1c7843691
--- /dev/null
+++ b/src/containers/HierarchyLineContainer/index.js
@@ -0,0 +1 @@
+export default from './HierarchyLineContainer';
diff --git a/src/containers/LicencesTableContainer/LicencesTableContainer.js b/src/containers/LicencesTableContainer/LicencesTableContainer.js
index c10ab182e..74394b568 100644
--- a/src/containers/LicencesTableContainer/LicencesTableContainer.js
+++ b/src/containers/LicencesTableContainer/LicencesTableContainer.js
@@ -9,8 +9,6 @@ import LicencesTable from '../../components/Instances/LicencesTable';
 import { fetchInstanceLincences } from '../../redux/modules/licences';
 import { getLicencesOfInstance } from '../../redux/selectors/licences';
 
-import { clientOnly } from '../../helpers/clientOnly';
-
 class LicencesTableContainer extends Component {
   static loadAsync = ({ instanceId }, dispatch) =>
     dispatch(fetchInstanceLincences(instanceId));
@@ -44,8 +42,6 @@ export default connect(
   }),
   (dispatch, { instance }) => ({
     loadAsync: () =>
-      clientOnly(() =>
-        LicencesTableContainer.loadAsync({ instanceId: instance.id }, dispatch)
-      )
+      LicencesTableContainer.loadAsync({ instanceId: instance.id }, dispatch)
   })
 )(LicencesTableContainer);
diff --git a/src/containers/SisSupervisorGroupsContainer/SisSupervisorGroupsContainer.js b/src/containers/SisSupervisorGroupsContainer/SisSupervisorGroupsContainer.js
index d633d609b..620930f2d 100644
--- a/src/containers/SisSupervisorGroupsContainer/SisSupervisorGroupsContainer.js
+++ b/src/containers/SisSupervisorGroupsContainer/SisSupervisorGroupsContainer.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage, injectIntl } from 'react-intl';
 import Box from '../../components/widgets/Box';
 import { Table, Accordion, Panel, Row, Col } from 'react-bootstrap';
 import Button from '../../components/widgets/FlatButton';
@@ -26,7 +26,25 @@ import SisBindGroupForm from '../../components/forms/SisBindGroupForm';
 import withLinks from '../../hoc/withLinks';
 import './SisSupervisorGroupsContainer.css';
 
-const days = ['Po', 'Út', 'St', 'Čt', 'Pá', 'So', 'Ne'];
+const days = {
+  cs: ['Po', 'Út', 'St', 'Čt', 'Pá', 'So', 'Ne'],
+  en: ['Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa', 'Su']
+};
+
+const oddEven = {
+  cs: ['lichý', 'sudý'],
+  en: ['odd', 'even']
+};
+
+const getLocalizedData = (obj, locale) => {
+  if (obj && obj[locale]) {
+    return obj[locale];
+  } else if (obj && Object.keys(obj).length > 0) {
+    return Object.keys(obj)[0];
+  } else {
+    return null;
+  }
+};
 
 class SisSupervisorGroupsContainer extends Component {
   componentDidMount() {
@@ -60,7 +78,8 @@ class SisSupervisorGroupsContainer extends Component {
       createGroup,
       bindGroup,
       sisPossibleParents,
-      links: { GROUP_URI_FACTORY }
+      links: { GROUP_URI_FACTORY },
+      intl: { locale }
     } = this.props;
     return (
       <Box
@@ -115,16 +134,27 @@ class SisSupervisorGroupsContainer extends Component {
                                                 className="leftIcon"
                                               />}
                                             <span>
-                                              {course.course.captions.cs} (<code>{course.course.code}</code>){' '}
+                                              {getLocalizedData(
+                                                course.course.captions,
+                                                locale
+                                              )}{' '}
+                                              (<code>{course.course.code}</code>){' '}
                                             </span>
                                           </span>
                                           <span className="pull-right">
-                                            {days[course.course.dayOfWeek]}{' '}
+                                            {
+                                              getLocalizedData(days, locale)[
+                                                course.course.dayOfWeek
+                                              ]
+                                            }{' '}
                                             {course.course.time}{' '}
                                             {course.course.fortnightly
-                                              ? course.course.oddWeeks
-                                                ? '(lichý)'
-                                                : '(sudý)'
+                                              ? getLocalizedData(
+                                                  oddEven,
+                                                  locale
+                                                )[
+                                                  course.course.oddWeeks ? 0 : 1
+                                                ]
                                               : ''}
                                           </span>
                                         </span>
@@ -275,28 +305,32 @@ SisSupervisorGroupsContainer.propTypes = {
   createGroup: PropTypes.func.isRequired,
   bindGroup: PropTypes.func.isRequired,
   links: PropTypes.object,
-  sisPossibleParents: PropTypes.func.isRequired
+  sisPossibleParents: PropTypes.func.isRequired,
+  intl: PropTypes.shape({ locale: PropTypes.string.isRequired }).isRequired
 };
 
-export default withLinks(
-  connect(
-    state => {
-      const currentUserId = loggedInUserIdSelector(state);
-      return {
-        sisStatus: sisStateSelector(state),
-        currentUserId,
-        sisCourses: (year, term) =>
-          sisSupervisedCoursesSelector(currentUserId, year, term)(state),
-        sisPossibleParents: courseId =>
-          sisPossibleParentsSelector(courseId)(state)
-      };
-    },
-    dispatch => ({
-      loadData: loggedInUserId =>
-        SisSupervisorGroupsContainer.loadData(dispatch, loggedInUserId),
-      createGroup: (courseId, data) => dispatch(sisCreateGroup(courseId, data)),
-      bindGroup: (courseId, data, userId, year, term) =>
-        dispatch(sisBindGroup(courseId, data, userId, year, term))
-    })
-  )(SisSupervisorGroupsContainer)
+export default injectIntl(
+  withLinks(
+    connect(
+      state => {
+        const currentUserId = loggedInUserIdSelector(state);
+        return {
+          sisStatus: sisStateSelector(state),
+          currentUserId,
+          sisCourses: (year, term) =>
+            sisSupervisedCoursesSelector(currentUserId, year, term)(state),
+          sisPossibleParents: courseId =>
+            sisPossibleParentsSelector(courseId)(state)
+        };
+      },
+      dispatch => ({
+        loadData: loggedInUserId =>
+          SisSupervisorGroupsContainer.loadData(dispatch, loggedInUserId),
+        createGroup: (courseId, data) =>
+          dispatch(sisCreateGroup(courseId, data)),
+        bindGroup: (courseId, data, userId, year, term) =>
+          dispatch(sisBindGroup(courseId, data, userId, year, term))
+      })
+    )(SisSupervisorGroupsContainer)
+  )
 );
diff --git a/src/containers/SourceCodeViewerContainer/SourceCodeViewerContainer.js b/src/containers/SourceCodeViewerContainer/SourceCodeViewerContainer.js
index dd5bc8db6..870cb6e47 100644
--- a/src/containers/SourceCodeViewerContainer/SourceCodeViewerContainer.js
+++ b/src/containers/SourceCodeViewerContainer/SourceCodeViewerContainer.js
@@ -16,8 +16,6 @@ import SourceCodeViewer from '../../components/helpers/SourceCodeViewer';
 import styles from './sourceCode.less';
 
 class SourceCodeViewerContainer extends Component {
-  state = { height: null };
-
   componentWillMount() {
     const { fileId, loadAsync } = this.props;
     if (fileId !== null) {
@@ -31,45 +29,13 @@ class SourceCodeViewerContainer extends Component {
     }
   }
 
-  onModalEntered() {
-    if (this.state.height === null) {
-      const { headerRef, bodyRef, footerRef } = this;
-      const height =
-        window.innerHeight -
-        headerRef.clientHeight -
-        bodyRef.clientHeight -
-        footerRef.clientHeight;
-      this.setState({ height });
-    }
-  }
-
-  onModalEnteredWhileLoading() {
-    if (this.state.height === null) {
-      const { loadingHeaderRef, loadingBodyRef, loadingFooterRef } = this;
-      const height =
-        window.innerHeight -
-        loadingHeaderRef.clientHeight -
-        loadingBodyRef.clientHeight -
-        loadingFooterRef.clientHeight;
-      this.setState({ height });
-    } else {
-      // console.log('already has height', this.state.height);
-    }
-  }
-
   render() {
-    const { show, onHide, download, file, code } = this.props;
-    const { height } = this.state;
+    const { show, onHide, download, file, content } = this.props;
     return (
       <ResourceRenderer
         loading={
-          <Modal
-            show={show}
-            onHide={onHide}
-            dialogClassName={styles.modal}
-            onEntered={() => this.onModalEnteredWhileLoading()}
-          >
-            <div ref={header => (this.loadingHeaderRef = header)}>
+          <Modal show={show} onHide={onHide} dialogClassName={styles.modal}>
+            <div>
               <Modal.Header closeButton>
                 <Modal.Title>
                   <LoadingIcon />{' '}
@@ -80,12 +46,14 @@ class SourceCodeViewerContainer extends Component {
                 </Modal.Title>
               </Modal.Header>
             </div>
-            <div ref={body => (this.loadingBodyRef = body)}>
+            <div>
               <Modal.Body className={styles.modalBody}>
-                <SourceCodeViewer content="" name="" />
+                <div>
+                  <SourceCodeViewer content="" name="" />
+                </div>
               </Modal.Body>
             </div>
-            <div ref={footer => (this.loadingFooterRef = footer)}>
+            <div>
               <Modal.Footer>
                 <Button disabled>
                   <DownloadIcon />{' '}
@@ -98,32 +66,45 @@ class SourceCodeViewerContainer extends Component {
             </div>
           </Modal>
         }
-        resource={[file, code]}
+        resource={[file, content]}
       >
-        {(file, code) =>
-          <Modal
-            show={show}
-            onHide={onHide}
-            dialogClassName={styles.modal}
-            onEntered={() => this.onModalEntered()}
-          >
-            <div ref={header => (this.headerRef = header)}>
+        {(file, content) =>
+          <Modal show={show} onHide={onHide} dialogClassName={styles.modal}>
+            <div>
               <Modal.Header closeButton>
                 <Modal.Title>
                   {file.name}
                 </Modal.Title>
               </Modal.Header>
             </div>
-            <div ref={body => (this.bodyRef = body)}>
+            <div>
               <Modal.Body className={styles.modalBody}>
-                <SourceCodeViewer
-                  content={code}
-                  name={file.name}
-                  height={height}
-                />
+                {(content.malformedCharacters || content.tooLarge) &&
+                  <div className="callout callout-warning">
+                    {content.malformedCharacters &&
+                      <p>
+                        <FormattedMessage
+                          id="app.sourceCodeViewer.utf8Warning"
+                          defaultMessage="The source file is not a valid UTF-8 file. Some characters may be displayed incorrectly. Use the download button to see unaltered source file."
+                        />
+                      </p>}
+                    {content.tooLarge &&
+                      <p>
+                        <FormattedMessage
+                          id="app.sourceCodeViewer.incompleteWarning"
+                          defaultMessage="The selected source file is too large. Only a leading part of the file is displayed here. Use the download button to get the whole file."
+                        />
+                      </p>}
+                  </div>}
+                <div>
+                  <SourceCodeViewer
+                    content={content.content}
+                    name={file.name}
+                  />
+                </div>
               </Modal.Body>
             </div>
-            <div ref={footer => (this.footerRef = footer)}>
+            <div>
               <Modal.Footer>
                 <Button onClick={() => download(file.id)}>
                   <DownloadIcon />{' '}
@@ -147,13 +128,13 @@ SourceCodeViewerContainer.propTypes = {
   onHide: PropTypes.func.isRequired,
   loadAsync: PropTypes.func.isRequired,
   download: PropTypes.func.isRequired,
-  code: ImmutablePropTypes.map
+  content: ImmutablePropTypes.map
 };
 
 export default connect(
   (state, { fileId }) => ({
     file: getFile(fileId)(state),
-    code: getFilesContent(fileId)(state)
+    content: getFilesContent(fileId)(state)
   }),
   (dispatch, { fileId }) => ({
     loadAsync: () =>
diff --git a/src/containers/SourceCodeViewerContainer/sourceCode.less b/src/containers/SourceCodeViewerContainer/sourceCode.less
index 3a3b74f20..50949cd75 100644
--- a/src/containers/SourceCodeViewerContainer/sourceCode.less
+++ b/src/containers/SourceCodeViewerContainer/sourceCode.less
@@ -1,12 +1,38 @@
 .modal {
-  width: 100%;
-  height: 100%;
+  position: absolute;
+  width: auto;
+  height: auto;
+  top: 1vmax;
+  bottom: 1vmax;
+  left: 1vmax;
+  right: 1vmax;
   margin: 0;
 
   & > :global(.modal-content) {
     min-height: 100%;
+    display: flex;
+    flex-direction: column;
+
+    & > div:nth-child(2) {
+      flex-grow: 1;
+      display: flex;
+      flex-direction: column;
+    }
   }
 }
 
 .modalBody {
+  flex-grow: 1;
+  display: flex;
+  flex-direction: column;
+
+  & > *:last-child {
+    flex-grow: 1;
+    display: flex;
+    flex-direction: column;
+
+    & > * {
+      flex-grow: 1;
+    }
+  }
 }
diff --git a/src/containers/SubmissionsTableContainer/SubmissionsTableContainer.js b/src/containers/SubmissionsTableContainer/SubmissionsTableContainer.js
index bea7a19ed..20132f8af 100644
--- a/src/containers/SubmissionsTableContainer/SubmissionsTableContainer.js
+++ b/src/containers/SubmissionsTableContainer/SubmissionsTableContainer.js
@@ -6,29 +6,20 @@ import { List } from 'immutable';
 
 import { fetchUsersSubmissions } from '../../redux/modules/submissions';
 import SubmissionsTable from '../../components/Assignments/SubmissionsTable';
-import { loggedInUserIdSelector } from '../../redux/selectors/auth';
-import {
-  createGetUsersSubmissionsForAssignment
-} from '../../redux/selectors/assignments';
+import { createGetUsersSubmissionsForAssignment } from '../../redux/selectors/assignments';
 
 class SubmissionsTableContainer extends Component {
-  componentWillMount() {
-    SubmissionsTableContainer.loadData(this.props);
-  }
+  componentWillMount = () => this.props.loadAsync();
 
   componentWillReceiveProps(newProps) {
     if (
       this.props.assignmentId !== newProps.assignmentId ||
       this.props.userId !== newProps.userId
     ) {
-      SubmissionsTableContainer.loadData(newProps);
+      newProps.loadAsync();
     }
   }
 
-  static loadData = ({ userId, assignmentId, loadSubmissionsForUser }) => {
-    loadSubmissionsForUser(userId, assignmentId);
-  };
-
   sortSubmissions(submissions) {
     return submissions.sort((a, b) => {
       var aTimestamp = a.get('data').get('submittedAt');
@@ -65,20 +56,19 @@ SubmissionsTableContainer.propTypes = {
   userId: PropTypes.string.isRequired,
   title: PropTypes.string,
   assignmentId: PropTypes.string.isRequired,
-  submissions: PropTypes.instanceOf(List)
+  submissions: PropTypes.instanceOf(List),
+  loadAsync: PropTypes.func.isRequired
 };
 
 export default connect(
-  (state, props) => {
+  (state, { userId, assignmentId }) => {
     const getSubmissions = createGetUsersSubmissionsForAssignment();
-    const userId = props.userId ? props.userId : loggedInUserIdSelector(state);
     return {
       userId,
-      submissions: getSubmissions(state, userId, props.assignmentId)
+      submissions: getSubmissions(state, userId, assignmentId)
     };
   },
-  (dispatch, props) => ({
-    loadSubmissionsForUser: (userId, assignmentId) =>
-      dispatch(fetchUsersSubmissions(userId, assignmentId))
+  (dispatch, { userId, assignmentId }) => ({
+    loadAsync: () => dispatch(fetchUsersSubmissions(userId, assignmentId))
   })
 )(SubmissionsTableContainer);
diff --git a/src/containers/UsersNameContainer/UsersNameContainer.js b/src/containers/UsersNameContainer/UsersNameContainer.js
index 5a1bbc335..02d63ba3e 100644
--- a/src/containers/UsersNameContainer/UsersNameContainer.js
+++ b/src/containers/UsersNameContainer/UsersNameContainer.js
@@ -11,20 +11,19 @@ import UsersName, {
   LoadingUsersName,
   FailedUsersName
 } from '../../components/Users/UsersName';
-import { clientOnly } from '../../helpers/clientOnly';
 
 class UsersNameContainer extends Component {
   componentWillMount() {
-    this.props.loadData();
+    this.props.loadAsync();
   }
 
   componentWillReceiveProps(newProps) {
     if (this.props.userId !== newProps.userId) {
-      newProps.loadData();
+      newProps.loadAsync();
     }
   }
 
-  static loadData = (userId, dispatch) => {
+  static loadAsync = ({ userId }, dispatch) => {
     dispatch(fetchProfileIfNeeded(userId));
   };
 
@@ -56,7 +55,7 @@ UsersNameContainer.propTypes = {
   large: PropTypes.bool,
   user: ImmutablePropTypes.map,
   noLink: PropTypes.bool,
-  loadData: PropTypes.func.isRequired
+  loadAsync: PropTypes.func.isRequired
 };
 
 export default connect(
@@ -66,7 +65,6 @@ export default connect(
   }),
   (dispatch, { userId }) => ({
     loadProfileIfNeeded: () => dispatch(fetchProfileIfNeeded(userId)),
-    loadData: () =>
-      clientOnly(() => UsersNameContainer.loadData(userId, dispatch))
+    loadAsync: () => UsersNameContainer.loadAsync({ userId }, dispatch)
   })
 )(UsersNameContainer);
diff --git a/src/helpers/clientOnly.js b/src/helpers/clientOnly.js
deleted file mode 100644
index 5720c507e..000000000
--- a/src/helpers/clientOnly.js
+++ /dev/null
@@ -1 +0,0 @@
-export const clientOnly = fn => setTimeout(fn, 1);
diff --git a/src/helpers/dot.js b/src/helpers/dot.js
index 3493df9aa..7c61ceb2b 100644
--- a/src/helpers/dot.js
+++ b/src/helpers/dot.js
@@ -9,7 +9,7 @@ const createDependency = (from, to, clusterTo = null) => {
   return dep;
 };
 
-const createDotForPorts = ports =>
+const createDotForPorts = (name, ports) =>
   Object.keys(ports)
     .map(portName => ports[portName].value)
     .filter(value => value.length > 0)
@@ -22,8 +22,8 @@ const createDotForNodeFactory = dependencies => (
   i
 ) => {
   let hasFullSupport = true;
-  const inputs = createDotForPorts(portsIn);
-  const outputs = createDotForPorts(portsOut);
+  const inputs = createDotForPorts(name, portsIn);
+  const outputs = createDotForPorts(name, portsOut);
 
   return `
       subgraph cluster_${i} {
diff --git a/src/helpers/getLocalizedData.js b/src/helpers/getLocalizedData.js
new file mode 100644
index 000000000..e692486b7
--- /dev/null
+++ b/src/helpers/getLocalizedData.js
@@ -0,0 +1,9 @@
+const getLocalizedX = field => (entity, locale) => {
+  const localizedText = entity.localizedTexts.find(
+    text => text.locale === locale
+  );
+  return localizedText ? localizedText[field] : entity[field];
+};
+
+export const getLocalizedName = getLocalizedX('name');
+export const getLocalizedDescription = getLocalizedX('description');
diff --git a/src/locales/cs.json b/src/locales/cs.json
index 7ff75a654..79ed5978e 100644
--- a/src/locales/cs.json
+++ b/src/locales/cs.json
@@ -14,6 +14,8 @@
   "app.addLicence.validation.validUntilInThePast": "Platnost licence musí být v budoucnosti.",
   "app.additionalExerciseFilesTable.description": "Přídavné soubory k úloze jsou soubory, které mohou být použity v popisu úlohy pomocí unikátních odkazů zobrazených níže. Tyto soubory mohou být zobrazovány a stahovány studenty.",
   "app.additionalExerciseFilesTable.title": "Přídavné soubory k úloze",
+  "app.additionalFiles.deleteButton": "Delete",
+  "app.additionalFiles.deleteConfirm": "Are you sure you want to delete the file? This cannot be undone.",
   "app.additionalFilesTable.fileName": "Původní název",
   "app.additionalFilesTable.fileSize": "Velikost",
   "app.additionalFilesTable.fileUploadedAt": "Nahráno",
@@ -25,6 +27,7 @@
   "app.adminAssignmentsTable.noAssignments": "Nejsou dostupné žádné úlohy.",
   "app.adminAssignmentsTableRow.edit": "Upravit",
   "app.adminAssignmentsTableRow.loading": "Načítají se zadané úlohy ...",
+  "app.assignExerciseButton.isLocked": "Locked",
   "app.assignemntStatusIcon.evaluationFailed": "Žádné řesení nebylo správně vyhodnoceno.",
   "app.assignemntStatusIcon.failed": "Žádné správné řešení nebylo zatím odevzdáno.",
   "app.assignemntStatusIcon.inProgress": "Řešení úlohy je právě vyhodnocováno.",
@@ -38,9 +41,18 @@
   "app.assignment.isBonus": "Bonusová úloha:",
   "app.assignment.loading": "Načítá se zadání úlohy ...",
   "app.assignment.maxPoints": "Maximální počet bodů pro správné řešení:",
+  "app.assignment.pointsPercentualThreshold": "Points percentual threshold:",
   "app.assignment.runtimeEnvironmentsIds": "Povolené jazyky/frameworky/technologie:",
   "app.assignment.secondDeadline": "Druhý termín odevzdání:",
   "app.assignment.submissionsCountLimit": "Limit počtu odevzdaných řešení:",
+  "app.assignment.syncButton": "Update this assignment",
+  "app.assignment.syncDescription": "The exercise for this assignment was updated in following categories:",
+  "app.assignment.syncExerciseConfig": "Exercise configuration",
+  "app.assignment.syncExerciseEnvironmentConfigs": "Environment configuration",
+  "app.assignment.syncHardwareGroups": "Hardware groups",
+  "app.assignment.syncLimits": "Limits",
+  "app.assignment.syncLocalizedTexts": "Localized texts",
+  "app.assignment.syncRequired": "The exercise was updated!",
   "app.assignment.title": "Zadání úlohy",
   "app.assignment.viewResults": "Zobrazit výsledky studenta",
   "app.assignmentStats.title": "Statistiky zadané úlohy",
@@ -99,6 +111,7 @@
   "app.comments.loadingCommentThread": "Načítají se komentáře ...",
   "app.comments.noCommentsYet": "V tomto vláknu zatím nejsou žádné komentáře.",
   "app.comments.onlyYouCanSeeThisComment": "Pouze vy vidíte tento komentář.",
+  "app.comments.refresh": "Refresh",
   "app.comments.title": "Komentáře a poznámky",
   "app.comments.warnings.isPrivate": "<strong>Tento komentář uvidíte pouze vy - nebude veřejný.</strong>",
   "app.comments.warnings.isPublic": "<strong>Tento komentář bude veřejný.</strong>",
@@ -110,7 +123,6 @@
   "app.createGroup.isPublic": "Studenti se mohou sami přidávat k této skupině",
   "app.createGroup.publicStats": "Studenti mohou vidět dosažené body ostatních",
   "app.createGroup.threshold": "Minimální procentuální hranice potřebná ke splnění tohoto kurzu:",
-  "app.createGroup.validation.emptyDescription": "Popis skupiny nemůže být prázdný.",
   "app.createGroup.validation.emptyName": "Název skupiny nemůže být prázdný.",
   "app.createGroup.validation.nameCollision": "Jméno \"{name}\" je již obsazené, prosíme vyberte jiné.",
   "app.createGroup.validation.thresholdBetweenZeroHundred": "Procentuální hranice musí být celé číslo od 0 do 100.",
@@ -147,7 +159,6 @@
   "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.remove": "Odstranit tento jazyk",
   "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.",
@@ -175,16 +186,6 @@
   "app.editAssignmentForm.validation.secondDeadline": "Prosíme vyplňte datum a čas druhého termínu odevzdání.",
   "app.editAssignmentForm.validation.secondDeadlineBeforeFirstDeadline": "Prosíme vyplňte datum a čas druhého termínu odevzdání, které je po {firstDeadline, date} {firstDeadline, time, short}.",
   "app.editAssignmentForm.validation.submissionsCountLimit": "Prosíme vyplňte maximální počet odevzdaných řešení jako kladné celé číslo.",
-  "app.editAssignmentLimitsForm.failed": "Saving failed. Please try again later.",
-  "app.editAssignmentLimitsForm.submit": "Change limits",
-  "app.editAssignmentLimitsForm.submitting": "Saving limits ...",
-  "app.editAssignmentLimitsForm.success": "Limits were saved.",
-  "app.editAssignmentLimitsForm.validation.envName": "Please fill environment name.",
-  "app.editAssignmentLimitsForm.validation.memoryIsNotNumer": "Memory limit must be an integer.",
-  "app.editAssignmentLimitsForm.validation.memoryLimit": "Memory limit must be a positive integer.",
-  "app.editAssignmentLimitsForm.validation.timeIsNotNumer": "Time limit must be a real number.",
-  "app.editAssignmentLimitsForm.validation.timeLimit": "Time limit must be a positive real number.",
-  "app.editAssignmentLimitsForm.validation.useDotDecimalSeparator": "Please use a dot as a decimal separator instead of the comma.",
   "app.editEnvironmentConfigForm.failed": "Uložení se nezdařilo. Prosíme opakujte akci později.",
   "app.editEnvironmentConfigForm.submit": "Změnit konfiguraci",
   "app.editEnvironmentConfigForm.submitting": "Ukládání konfigurace ...",
@@ -211,13 +212,6 @@
   "app.editEnvironmentConfigVariables.stringArrayType": "Array of strings",
   "app.editEnvironmentConfigVariables.stringType": "Řetězec",
   "app.editEnvironmentConfigVariables.variables": "Proměnné:",
-  "app.editEnvironmentLimitsForm.box": "Box",
-  "app.editEnvironmentLimitsForm.environment.name": "Název běhového prostředí:",
-  "app.editEnvironmentLimitsForm.environment.noEnvironment": "Pro tuto úlohu není specifikováno žádné běhové prostředí.",
-  "app.editEnvironmentLimitsForm.newEnvironment": "Nové běhové prostředí",
-  "app.editEnvironmentLimitsForm.noBoxesForPipeline": "There are no boxes which need to set limits in this pipeline.",
-  "app.editEnvironmentLimitsForm.noPipelinesForTest": "There are no pipelines for this test to edit.",
-  "app.editEnvironmentLimitsForm.pipeline": "Pipeline",
   "app.editEnvironmentLimitsForm.submit": "Save changes to {env}",
   "app.editEnvironmentLimitsForm.submitting": "Saving changes ...",
   "app.editEnvironmentLimitsForm.success": "Saved.",
@@ -242,10 +236,8 @@
   "app.editExerciseConfigEnvironment.reallyRemoveQuestion": "Opravdu chcete smazat tuto konfiguraci prostředí?",
   "app.editExerciseConfigForm.addTest": "Přidat nový test",
   "app.editExerciseConfigForm.failed": "Uložení se nezdařilo. Prosíme opakujte akci později.",
-  "app.editExerciseConfigForm.fileType": "Soubor",
   "app.editExerciseConfigForm.pipelines": "Pipeliny",
   "app.editExerciseConfigForm.removeLastTest": "Odstranit poslední test",
-  "app.editExerciseConfigForm.stringType": "Řetězec",
   "app.editExerciseConfigForm.submit": "Změnit konfiguraci",
   "app.editExerciseConfigForm.submitting": "Ukládání konfigurace ...",
   "app.editExerciseConfigForm.success": "Konfigurace byla uložena.",
@@ -276,24 +268,6 @@
   "app.editExerciseForm.validation.noLocalizedText": "Prosíme přidejte alespoň jeden lokalizovaný text popisující tuto úlohu.",
   "app.editExerciseForm.validation.sameLocalizedTexts": "Je vyplněno více jazykových variant pro jednu lokalizaci. Prosím ujistěte se, že lokalizace jsou unikátní.",
   "app.editExerciseForm.validation.versionDiffers": "Někdo změnil tuto úlohu v průběhu její editace. Prosíme obnovte si tuto stránku a proveďte své změny znovu.",
-  "app.editExerciseLimitsForm.failed": "Uložení se nezdařilo. Prosíme opakujte akci později.",
-  "app.editExerciseLimitsForm.submit": "Změnit limity",
-  "app.editExerciseLimitsForm.submitting": "Ukládání limitů ...",
-  "app.editExerciseLimitsForm.success": "Limity byly uloženy.",
-  "app.editExerciseLimitsForm.validation.envName": "Prosím vyplňte název běhového prostředí.",
-  "app.editExerciseLimitsForm.validation.memoryIsNotNumer": "Paměťový limit musí být celé číslo.",
-  "app.editExerciseLimitsForm.validation.memoryLimit": "Paměťový limit musí být kladné celé číslo.",
-  "app.editExerciseLimitsForm.validation.timeIsNotNumer": "Časový limit musí být reálné číslo.",
-  "app.editExerciseLimitsForm.validation.timeLimit": "Časový limit musí být kladné reálné číslo.",
-  "app.editExerciseLimitsForm.validation.useDotDecimalSeparator": "Prosím použijte tečku jako oddělovač místo čárky.",
-  "app.editExerciseRuntimeConfigsForm.failed": "Uložení se nezdařilo. Prosíme, opakujte akci později.",
-  "app.editExerciseRuntimeConfigsForm.submit": "Změnit běhová prostředí",
-  "app.editExerciseRuntimeConfigsForm.submitting": "Ukládání běhových prostředí ...",
-  "app.editExerciseRuntimeConfigsForm.success": "Běhová prostředí byla uložena.",
-  "app.editExerciseRuntimeConfigsForm.validation.empty": "Prosíme vyplňte alespoň jedno běhové prostředí.",
-  "app.editExerciseRuntimeConfigsForm.validation.jobConfig": "Prosíme vyplňte konfiguraci úlohy.",
-  "app.editExerciseRuntimeConfigsForm.validation.name": "Prosíme vyplňte jméno běhové konfigurace.",
-  "app.editExerciseRuntimeConfigsForm.validation.runtimeEnvironmentId": "Prosíme vyberte běhové prostředí.",
   "app.editGroup.cannotDeleteRootGroup": "Toto je primární skupina a jako taková nemůže být smazána.",
   "app.editGroup.deleteGroup": "Smazat skupinu",
   "app.editGroup.deleteGroupWarning": "Smazání skupiny odstraní také všechny podskupiny, skupinové úlohy a zadané úlohy včetně studentských řešení.",
@@ -335,14 +309,6 @@
   "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.editRuntimeConfigForm.addConfigTab": "Přidat nové běhové prostředí",
-  "app.editRuntimeConfigForm.configName": "Název konfigurace:",
-  "app.editRuntimeConfigForm.emptyConfigTabs": "Není k dispozici žádné běhové prostředí.",
-  "app.editRuntimeConfigForm.jobConfig": "Konfigurace úlohy:",
-  "app.editRuntimeConfigForm.moreAboutJobConfig": "Přečtěte si vice o syntaxi <a href='https://github.com/ReCodEx/wiki/wiki/Job-configuration' target='_blank'>konfigurace úlohy</a>.",
-  "app.editRuntimeConfigForm.newConfig": "Nová konfigurace",
-  "app.editRuntimeConfigForm.reallyRemoveQuestion": "Opravdu chcete odstranit toto běhové prostředí?",
-  "app.editRuntimeConfigForm.runtimeEnvironment": "Vyberte běhové prostředí:",
   "app.editUser.description": "Upravit nastavení uživatele",
   "app.editUser.title": "Upravit uživatelský profil",
   "app.editUserProfile.degreesAfterName": "Tituly za jménem:",
@@ -355,8 +321,6 @@
   "app.editUserProfile.validation.emptyFirstName": "Jméno nemůže být prázdné.",
   "app.editUserProfile.validation.emptyLastName": "Příjmení nemůže být prázdné.",
   "app.editUserProfile.validation.emptyNewPassword": "Nové heslo nemůže být prázdné pokud si měníte heslo.",
-  "app.editUserProfile.validation.emptyOldPassword": "Staré heslo nemůže být prázdné pokud si měníte heslo.",
-  "app.editUserProfile.validation.passwordTooWeak": "Heslo je příliš slabé, vyplňte prosím jiné.",
   "app.editUserProfile.validation.passwordsDontMatch": "Hesla se neshodují.",
   "app.editUserProfile.validation.samePasswords": "Změnit Vaše heslo na stejné nedává žádný smysl.",
   "app.editUserProfile.validation.shortFirstName": "First name must contain at least 2 characters.",
@@ -392,9 +356,7 @@
   "app.evaluationDetail.bonusPoints": "Bonusové body:",
   "app.evaluationDetail.buildSucceeded": "Kompilace:",
   "app.evaluationDetail.evaluatedAt": "Vyhodnoceno:",
-  "app.evaluationDetail.hasFinished": "Proces vyhodnocení skončil:",
   "app.evaluationDetail.isCorrect": "Správnost:",
-  "app.evaluationDetail.isValid": "Vyhodnocení je úspěšné:",
   "app.evaluationDetail.score": "Skóre:",
   "app.evaluationDetail.title.compilationLogs": "Logy kompilace",
   "app.evaluationDetail.title.details": "Detaily vyhodnocení",
@@ -408,8 +370,9 @@
   "app.evaluationProgressStatus.skipped": "PŘESKOČENO",
   "app.evaluationTable.empty": "There are no evaluations in this list.",
   "app.evaluationTable.evaluatedAt": "Vyhodnoceno:",
+  "app.evaluationTable.notAvailable": "Evaluation not available",
+  "app.evaluationTable.score": "Score:",
   "app.evaluationTable.showDetails": "Zobrazit detaily",
-  "app.exercise.assign": "Zadat",
   "app.exercise.assignButton": "Zadat",
   "app.exercise.assignToGroup": "Můžete zadat tuto úlohu pro skupiny, kde jste cvičící.",
   "app.exercise.author": "Autor:",
@@ -428,25 +391,22 @@
   "app.exercise.editSettings": "Upravit nastavení úlohy",
   "app.exercise.exercisePipelines": "Exercise Pipelines",
   "app.exercise.forked": "Duplikováno z:",
-  "app.exercise.group": "Skupina:",
+  "app.exercise.groups": "Groups:",
   "app.exercise.groupsBox": "Skupiny",
+  "app.exercise.isLocked": "Is locked:",
+  "app.exercise.isPublic": "Is public:",
   "app.exercise.noReferenceSolutions": "Nyní zde nejsou žádná referenční řešení pro tuto úlohu.",
   "app.exercise.publicGroup": "Public",
+  "app.exercise.referenceSolution.deleteButton": "Delete",
+  "app.exercise.referenceSolution.deleteConfirm": "Are you sure you want to delete the reference solution? This cannot be undone.",
   "app.exercise.referenceSolutionDetail": "Detail referenčního řešení",
+  "app.exercise.referenceSolutionEvaluationDescription": "Evaluation",
+  "app.exercise.referenceSolutionEvaluationDetail": "Evaluation detail",
+  "app.exercise.referenceSolutionEvaluationTitle": "Reference solution evaluation",
   "app.exercise.referenceSolutionTitle": "Přehled referenčního řešení",
   "app.exercise.referenceSolutionsBox": "Referenční řešení",
   "app.exercise.runtimes": "Podporovaná běhová prostředí:",
   "app.exercise.updatedAt": "Naposledy změněno:",
-  "app.exercise.uploadReferenceSolution.createButton": "Create account",
-  "app.exercise.uploadReferenceSolution.createSuccessful": "Solution created successfully.",
-  "app.exercise.uploadReferenceSolution.creatingButtonText": "Creating solution ...",
-  "app.exercise.uploadReferenceSolution.creationFailed": "Solution was rejected by the server.",
-  "app.exercise.uploadReferenceSolution.instructions": "Musíte připojit alespoň jeden soubor se zdrojovým kódem a počkat, než jsou všechny soubory nahrány na server. Pokud nastane problém při uploadu některých soborů, nahrajte je znovu nebo soubory odeberte. Jméno souboru NESMÍ OBSAHOVAT žádné nestandardní znaky (například v kódování UTF-8).",
-  "app.exercise.uploadReferenceSolution.noteLabel": "Description of the provided exercise solution",
-  "app.exercise.uploadReferenceSolution.resetFormButton": "Reset form",
-  "app.exercise.uploadReferenceSolution.runtimeConfigs": "Runtime Configuration:",
-  "app.exercise.uploadReferenceSolution.validation.emptyNote": "Description of the solution cannot be empty.",
-  "app.exercise.uploadReferenceSolution.validation.runtimeId": "Please select one of the runtime configurations.",
   "app.exercise.uploadReferenceSolutionBox": "Vytvořit referenční řešení",
   "app.exercise.version": "Verze:",
   "app.exercises.add": "Přidat úlohu",
@@ -465,11 +425,10 @@
   "app.exercisesList.created": "Vytvořeno",
   "app.exercisesList.difficulty": "Obtížnost",
   "app.exercisesList.empty": "Nenalezeny žádné úlohy k zobrazení.",
-  "app.exercisesList.group": "Skupina",
+  "app.exercisesList.groups": "Groups",
   "app.exercisesList.name": "Jméno",
   "app.exercisesListItem.group.public": "Veřejné",
   "app.exercisesName.loading": "Loading ...",
-  "app.exercisesSimpleList.actions": "Akce",
   "app.exercisesSimpleList.difficulty": "Obtížnost",
   "app.exercisesSimpleList.empty": "V tomto seznamu nejsou žádné úlohy.",
   "app.exercisesSimpleList.name": "Jméno",
@@ -505,6 +464,7 @@
   "app.exitCodes.mono.200": "Internal error",
   "app.exitCodes.mono.201": "No main method",
   "app.exitCodes.mono.202": "More main methods",
+  "app.exitCodes.unknown": "Unknown",
   "app.externalRegistrationForm.failed": "Registrace se nezdařila. Prosíme, zkontrolujte vyplněné informace.",
   "app.externalRegistrationForm.instance": "Instance:",
   "app.externalRegistrationForm.password": "Heslo:",
@@ -517,6 +477,8 @@
   "app.failedGroupDetail.msg": "Načtení skupiny se nezdařilo. Prosíme zkuste dotaz opakovat později.",
   "app.failedSubmissionDetail.description": "Prosíme zkontroluje své připojení k internetu a zkuste dotaz později.",
   "app.failedSubmissionDetail.title": "Načtení vyhodnocení úlohy se nezdařilo",
+  "app.faq.description": "ReCodEx FAQ",
+  "app.faq.title": "FAQ",
   "app.feedbackAndBugs.contribution": "If you are interested in frontend web development, feel free to fix the bug itself and send a pull request! Any help will be much appreciated!",
   "app.feedbackAndBugs.description": "Ooh.. you found a bug?",
   "app.feedbackAndBugs.feedbackTitle": "How can I give you feedback?",
@@ -524,6 +486,7 @@
   "app.feedbackAndBugs.title": "Feedback and Bugs Reporting",
   "app.feedbackAndBugs.whereToReportBugs": "Where can I report bugs?",
   "app.feedbackAndBugs.whereToReportBugsText": "Every software contains bugs and we are well avare of this fact. From time to time you might find a bug that nobody else has reported and which hasn't been fixed yet. Please report all bugs to our issue tracker on GitHub - just file a new issue and give it a label 'bug'. We will try to investigate and release a bugfix as soon as possible.",
+  "app.field.isRequired": "This field is required.",
   "app.fields.limits.memory": "Test memory limit:",
   "app.fields.limits.time": "Test time limit:",
   "app.footer.copyright": "Copyright © 2016-2017 <a href=\"{website}\">ReCodEx</a>.</strong> Všechna práva vyhrazena.",
@@ -556,6 +519,7 @@
   "app.groupDetail.externalId": "Externí identifikace skupiny (např. identifikátor skupiny ve školním systému):",
   "app.groupDetail.isPublic": "Je veřejná:",
   "app.groupDetail.loading": "Načítání popisu skupiny ...",
+  "app.groupDetail.subgroups": "Subgroups hierarchy",
   "app.groupDetail.supervisors": "Cvíčící skupiny {groupName}",
   "app.groupDetail.threshold": "Minimální procentuální počet bodů potřebných ke splnění tohoto kurzu:",
   "app.groupResultsTableRow.loading": "Načítání výsledků ...",
@@ -567,14 +531,12 @@
   "app.groups.makeGroupAdminButton": "Změnit na správce skupiny",
   "app.groups.makeSupervisorButton": "Přidat cvičícího",
   "app.groups.removeFromGroup": "Odebrat ze skupiny",
+  "app.groups.removeGroupAdminButton": "Remove group admin",
   "app.groups.removeSupervisorButton": "Odebrat cvičícího",
   "app.groupsName.loading": "Načítání ...",
-  "app.hardwareGroupFields.memoryLimit": "Paměťový limit pro \"{taskId}\":",
-  "app.hardwareGroupFields.noReferenceSolutions": "Test '{testName}' and jeho task '{taskId}' nemá žádné referenční řešení.",
-  "app.hardwareGroupFields.test": "Test:",
-  "app.hardwareGroupFields.timeLimit": "Časový limit pro \"{taskId}\":",
   "app.header.toggleSidebar": "Zobrazit/skrýt boční panel",
   "app.header.toggleSidebarSize": "Zvětšit/zmenšit boční panel",
+  "app.headerNotification.copiedToClippboard": "Copied to clippboard.",
   "app.homepage.aboutAndroidApp": "Vyvinuli jsme také jednoduchou aplikaci pro Android, která vám může pomoci zkontrolovat nově zadané úlohy a sledovat vaše statistiky odevzdaných řešení zatímco cestujete tramvají či autobusem.",
   "app.homepage.aboutContentP1": "Projekt vznikl v rámci předmětu <i>Softwarový projekt</i> v roce 2016 jako náhrada za již zastaralý systém CodEx používaný na MFF UK. Projekt je zveřejněn pod <a href='https://opensource.org/licenses/MIT'>MIT</a> licencí a hostován na <a href='https://github.com/ReCodEx'>GitHubu</a>. Podrobnější informace jsou k dispozici na <a href='https://github.com/ReCodEx/wiki/wiki'>Wiki</a> projektu.",
   "app.homepage.aboutContentP2": "Při vývoji se objevila řada <a href='https://github.com/ReCodEx/wiki/wiki/Conclusion#further-improvements'>témat</a> pro studentské projekty různého typu, v případě zájmu o vylepšení tohoto systému neváhejte kontaktovat <a href='https://github.com/orgs/ReCodEx/people'>autory</a> nebo některého z vyučujících.",
@@ -604,6 +566,7 @@
   "app.instancesTable.admin": "Admin",
   "app.instancesTable.name": "Jméno",
   "app.instancesTable.validLicence": "Má platnou licenci",
+  "app.leaveGroup.confirm": "Are you sure you want to leave this group?",
   "app.licencesTable.isValid": "Bez revokace",
   "app.licencesTable.noLicences": "Nejsou zde žádné licence.",
   "app.licencesTable.note": "Popis",
@@ -615,15 +578,6 @@
   "app.login.description": "Prosíme zadejte své přihlašovací údaje",
   "app.login.resetPassword": "Obnovte si své heslo.",
   "app.login.title": "Přihlásit se",
-  "app.loginCASForm.failed": "Login failed. Please check your credentials.",
-  "app.loginCASForm.login": "Sign in",
-  "app.loginCASForm.password": "Password:",
-  "app.loginCASForm.processing": "Signing in ...",
-  "app.loginCASForm.success": "You are successfully signed in",
-  "app.loginCASForm.title": "Sign into ReCodEx using CAS UK",
-  "app.loginCASForm.ukco": "UKCO (student's number):",
-  "app.loginCASForm.validation.emptyPassword": "Password cannot be empty.",
-  "app.loginCASForm.validation.emptyUKCO": "UKCO address cannot be empty.",
   "app.loginForm.email": "E-mailová adresa:",
   "app.loginForm.failed": "Přihlášení selhalo. Prosíme zkontrolujte své přihlašovací údaje.",
   "app.loginForm.login": "Přihlásit se",
@@ -640,6 +594,7 @@
   "app.markdownTextArea.preview": "Náhled:",
   "app.markdownTextArea.showPreview": "Ukaž náhled",
   "app.maybeBonusAssignmentIcon.isBonus": "Je bonusová",
+  "app.maybeLockedExerciseIcon.isLocked": "Exercise is locked by author and cannot be assigned",
   "app.maybePublicIcon.isNotPublic": "Není veřejné",
   "app.maybePublicIcon.isPublic": "Je veřejné",
   "app.milisecondsTextField.humanReadable": "Čitelná podoba:",
@@ -649,10 +604,20 @@
   "app.notifications.hideAll": "Pouze nové notifikace",
   "app.notifications.showAll": "Zobrazit {count, plural, one {jednu starou notifikaci} two {dvě staré notifikace} other {# starých notifikací}}",
   "app.notifications.title": "{count, plural, =0 {Nemáte žádnou novou notifikaci} one {Máte novou notifikaci} =2 {Máte dvě nové notifikace} =3 {Máte tři nové notifikace} =4 {Máte čtyři nové notifikace}  other {Máte # nových notifikací}}",
+  "app.page.exercises.failed": "Cannot load the list of exercises",
+  "app.page.exercises.failedDescription": "We are sorry for the inconvenience, please try again later.",
+  "app.page.exercises.loading": "Loading list of exercises ...",
+  "app.page.exercises.loadingDescription": "Please wait while we are getting the list of exercises ready.",
   "app.page.failed": "Načtení stránky se nezdařilo",
   "app.page.failedDescription": "Prosíme, zkuste to později. Omlouváme se za způsobené problémy.",
   "app.page.loading": "Načítání ...",
   "app.page.loadingDescription": "Prosíme počkejte než bude vše připraveno.",
+  "app.page.pipelines.loading": "Loading list of pipelines ...",
+  "app.page.pipelines.loadingDescription": "Please wait while we are getting the list of pipelines ready.",
+  "app.page.users.failed": "Cannot load the list of users",
+  "app.page.users.failedDescription": "We are sorry for the inconvenience, please try again later.",
+  "app.page.users.loading": "Loading list of users ...",
+  "app.page.users.loadingDescription": "Please wait while we are getting the list of users ready.",
   "app.passwordStrength.bad": "Víte to jistě?",
   "app.passwordStrength.good": "Dobře",
   "app.passwordStrength.ok": "OK",
@@ -689,7 +654,6 @@
   "app.pipelineEditor.BoxForm.success": "Saved",
   "app.pipelineEditor.BoxForm.type": "Type:",
   "app.pipelineEditor.EditBoxForm.title": "Edit the box '{name}'",
-  "app.pipelineEditor.addBoxForm.portsIn": "Inputs",
   "app.pipelineFilesTable.description": "Supplementary files are files which can be referenced as remote file in pipeline configuration.",
   "app.pipelineFilesTable.title": "Supplementary files",
   "app.pipelineVisualEditor.addBoxButton": "Add box",
@@ -751,17 +715,12 @@
   "app.recodex.bugsAndFeedbackUrl": "Open ReCodEx webapp repository",
   "app.referenceSolution.author": "Autor:",
   "app.referenceSolutionDetail.description": "Popis",
+  "app.referenceSolutionDetail.exercise": "Exercise",
   "app.referenceSolutionDetail.refreshEvaluations": "Obnovit",
   "app.referenceSolutionDetail.resubmit": "Znovu vyhodnotit",
   "app.referenceSolutionDetail.title.details": "Detail referenčního řešení",
   "app.referenceSolutionDetail.uploadedAt": "Nahráno:",
-  "app.referenceSolutionEvaluation.downloadResults": "Stáhnout výsledky",
-  "app.referenceSolutionEvaluation.titlePrefix": "Vyhodnocení pro běhové prostředí:",
-  "app.referenceSolutionsEvaluations.description": "Popis řešení",
-  "app.referenceSolutionsEvaluations.evaluatedAt": "Vyhodnoceno",
-  "app.referenceSolutionsEvaluations.memory": "Naměřené využití paměti",
-  "app.referenceSolutionsEvaluations.time": "Naměřený čas",
-  "app.referenceSolutionsEvaluations.title": "Vyhodnocení referenčního řešení",
+  "app.referenceSolutionEvaluation.title": "Evaluations of reference solution",
   "app.registration.description": "Začněte dnes používat ReCodEx",
   "app.registration.title": "Vytvořte si nový účet v ReCodExu",
   "app.registrationForm.createAccount": "Vytvořit účet",
@@ -782,9 +741,9 @@
   "app.registrationForm.validation.emptyLastName": "Příjmení nemůže být prázdné.",
   "app.registrationForm.validation.emptyPassword": "Heslo nemůže být prázdné.",
   "app.registrationForm.validation.passwordDontMatch": "Passwords don't match.",
-  "app.registrationForm.validation.passwordTooWeak": "Zvolené heslo je příliš slabé, prosím zvolte nějaké bezpečnější.",
   "app.registrationForm.validation.shortFirstName": "First name must contain at least 2 characters.",
   "app.registrationForm.validation.shortLastName": "Last name must contain at least 2 characters.",
+  "app.removeFromGroup.confirm": "Are you sure you want to remove the user from this group?",
   "app.resendEmailVerification.failed": "Opětovné odeslání selhalo. Prosíme opakujte akci později",
   "app.resendEmailVerification.resend": "Znovu odeslat ověřovací email",
   "app.resendEmailVerification.resending": "Odesílání emailu ...",
@@ -815,6 +774,7 @@
   "app.sidebar.menu.createAccount": "Zaregistrovat se",
   "app.sidebar.menu.dashboard": "Přehled",
   "app.sidebar.menu.exercises": "Úlohy",
+  "app.sidebar.menu.faq": "FAQ",
   "app.sidebar.menu.feedbackAndBugs": "Zpětná vazba a hlášení chyb",
   "app.sidebar.menu.pipelines": "Pipeliny",
   "app.sidebar.menu.signIn": "Přihlásit se",
@@ -848,7 +808,9 @@
   "app.sisSupervisor.noSisGroups": "Currently there are no ReCodEx groups matching this SIS lecture.",
   "app.sisSupervisor.yearTerm": "Year and term:",
   "app.sourceCodeViewer.downloadButton": "Stáhnout soubor",
+  "app.sourceCodeViewer.incompleteWarning": "Zdrojový soubor je příliš velký, a proto zde nemůže být zobrazen. Použijte tlačítko 'Stáhnout soubor', pokud si jej chcete prohlédnout celý.",
   "app.sourceCodeViewer.loading": "Načítání ...",
+  "app.sourceCodeViewer.utf8Warning": "Zdrojový soubor není v platném UTF-8 kódování. Některé znaky proto nemusí být zobrazeny správně. Pokud potřebujete soubor v původním kódování, použijte tlačítko k jeho stažení.",
   "app.studentsList.gainedPointsOfWithoutBreakingSpaces": "{gained, number} of {total, number}",
   "app.studentsList.noStudents": "V tomto seznamu nejsou žádní studenti.",
   "app.studentsView.assignments": "Zadané úlohy",
@@ -910,10 +872,9 @@
   "app.sudebar.menu.admin.title": "Administrátor",
   "app.sudebar.menu.student.title": "Student",
   "app.sudebar.menu.supervisor.title": "Cvičící",
-  "app.supplementaryFilesTable.addFiles": "Save supplementary files",
+  "app.supplementaryFiles.deleteButton": "Delete",
+  "app.supplementaryFiles.deleteConfirm": "Are you sure you want to delete the file? This cannot be undone.",
   "app.supplementaryFilesTable.description": "Soubory úlohy jsou soubory, které mohou být použity v nastavení úlohy jako vstupy nebo vzorové výstupy.",
-  "app.supplementaryFilesTable.empty": "There are no supplementary files attached to this exercise yet.",
-  "app.supplementaryFilesTable.fileHashName": "Hash Name",
   "app.supplementaryFilesTable.fileName": "Původní název",
   "app.supplementaryFilesTable.fileSize": "Velikost souboru",
   "app.supplementaryFilesTable.fileUploadedAt": "Nahrán",
@@ -933,13 +894,15 @@
   "app.user.welcomeTitle": "Vítejte v ReCodExu",
   "app.userList.noSupervisors": "V tomto seznamu nejsou žádní cvičící.",
   "app.userList.noUsers": "V tomto seznamu nejsou žádní uživatelé.",
+  "app.userSwitching.loginAs": "Login as",
   "app.users.description": "Procházení všech uživatelů ReCodExu.",
   "app.users.listTitle": "Uživatelé",
   "app.users.settings": "Nastavení",
+  "app.users.takeOver": "Login as",
   "app.users.title": "Seznam uživatelů",
   "app.users.users": "Uživatelé",
   "app.usersName.loading": "Načítání ...",
   "app.usersName.notVerified.title": "Tento účet nemá ověřenou emailovou adresu.",
   "app.usersStats.description": "Body získané ve skupině {name}.",
   "app.usersname.notVerified.description": "Tento uživatel si neověřil svou emailovou adresu přes aktivační odkaz, který mu byl na tuto adresu zaslán."
-}
+}
\ No newline at end of file
diff --git a/src/locales/en.json b/src/locales/en.json
index 014aecf4d..1c2e798bf 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -14,6 +14,8 @@
   "app.addLicence.validation.validUntilInThePast": "End of licence's valid period must be in the future.",
   "app.additionalExerciseFilesTable.description": "Additional exercise files are files which can be used within exercise description using links provided below. Additional files can be viewed or downloaded by students.",
   "app.additionalExerciseFilesTable.title": "Additional exercise files",
+  "app.additionalFiles.deleteButton": "Delete",
+  "app.additionalFiles.deleteConfirm": "Are you sure you want to delete the file? This cannot be undone.",
   "app.additionalFilesTable.fileName": "Original filename",
   "app.additionalFilesTable.fileSize": "Filesize",
   "app.additionalFilesTable.fileUploadedAt": "Uploaded at",
@@ -25,6 +27,7 @@
   "app.adminAssignmentsTable.noAssignments": "There are no assignments.",
   "app.adminAssignmentsTableRow.edit": "Edit",
   "app.adminAssignmentsTableRow.loading": "Loading assignments ...",
+  "app.assignExerciseButton.isLocked": "Locked",
   "app.assignemntStatusIcon.evaluationFailed": "No solution was evaluated correctly by ReCodEx.",
   "app.assignemntStatusIcon.failed": "No correct solution was submitted yet.",
   "app.assignemntStatusIcon.inProgress": "Assignment solution is being evaluated.",
@@ -38,9 +41,18 @@
   "app.assignment.isBonus": "Bonus assignment:",
   "app.assignment.loading": "Loading exercise assignment ...",
   "app.assignment.maxPoints": "Maximum number of points for a correct solution:",
+  "app.assignment.pointsPercentualThreshold": "Points percentual threshold:",
   "app.assignment.runtimeEnvironmentsIds": "Allowed languages/frameworks/technologies:",
   "app.assignment.secondDeadline": "Second deadline:",
   "app.assignment.submissionsCountLimit": "Submission count limit:",
+  "app.assignment.syncButton": "Update this assignment",
+  "app.assignment.syncDescription": "The exercise for this assignment was updated in following categories:",
+  "app.assignment.syncExerciseConfig": "Exercise configuration",
+  "app.assignment.syncExerciseEnvironmentConfigs": "Environment configuration",
+  "app.assignment.syncHardwareGroups": "Hardware groups",
+  "app.assignment.syncLimits": "Limits",
+  "app.assignment.syncLocalizedTexts": "Localized texts",
+  "app.assignment.syncRequired": "The exercise was updated!",
   "app.assignment.title": "Exercise assignment",
   "app.assignment.viewResults": "View student results",
   "app.assignmentStats.title": "Assignment statistics",
@@ -99,6 +111,7 @@
   "app.comments.loadingCommentThread": "Loading comments ...",
   "app.comments.noCommentsYet": "There are no comments in this thread yet.",
   "app.comments.onlyYouCanSeeThisComment": "Only you can see this comment",
+  "app.comments.refresh": "Refresh",
   "app.comments.title": "Comments and notes",
   "app.comments.warnings.isPrivate": "<strong>Only you will see this comment.</strong>",
   "app.comments.warnings.isPublic": "<strong>Everyone on this page will see this comment.</strong>",
@@ -110,7 +123,6 @@
   "app.createGroup.isPublic": "Students can join the group themselves",
   "app.createGroup.publicStats": "Students can see statistics of each other",
   "app.createGroup.threshold": "Minimum percent of the total points count needed to complete the course:",
-  "app.createGroup.validation.emptyDescription": "Group description cannot be empty.",
   "app.createGroup.validation.emptyName": "Group name cannot be empty.",
   "app.createGroup.validation.nameCollision": "The name \"{name}\" is already used, please choose a different one.",
   "app.createGroup.validation.thresholdBetweenZeroHundred": "Threshold must be an integer in between 0 and 100.",
@@ -147,7 +159,6 @@
   "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.remove": "Remove this language",
   "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.",
@@ -175,16 +186,6 @@
   "app.editAssignmentForm.validation.secondDeadline": "Please fill the date and time of the second deadline.",
   "app.editAssignmentForm.validation.secondDeadlineBeforeFirstDeadline": "Please fill the date and time of the second deadline with a value which is after {firstDeadline, date} {firstDeadline, time, short}.",
   "app.editAssignmentForm.validation.submissionsCountLimit": "Please fill the submissions count limit field with a positive integer.",
-  "app.editAssignmentLimitsForm.failed": "Saving failed. Please try again later.",
-  "app.editAssignmentLimitsForm.submit": "Change limits",
-  "app.editAssignmentLimitsForm.submitting": "Saving limits ...",
-  "app.editAssignmentLimitsForm.success": "Limits were saved.",
-  "app.editAssignmentLimitsForm.validation.envName": "Please fill environment name.",
-  "app.editAssignmentLimitsForm.validation.memoryIsNotNumer": "Memory limit must be an integer.",
-  "app.editAssignmentLimitsForm.validation.memoryLimit": "Memory limit must be a positive integer.",
-  "app.editAssignmentLimitsForm.validation.timeIsNotNumer": "Time limit must be a real number.",
-  "app.editAssignmentLimitsForm.validation.timeLimit": "Time limit must be a positive real number.",
-  "app.editAssignmentLimitsForm.validation.useDotDecimalSeparator": "Please use a dot as a decimal separator instead of the comma.",
   "app.editEnvironmentConfigForm.failed": "Saving failed. Please try again later.",
   "app.editEnvironmentConfigForm.submit": "Change configuration",
   "app.editEnvironmentConfigForm.submitting": "Saving configuration ...",
@@ -211,13 +212,6 @@
   "app.editEnvironmentConfigVariables.stringArrayType": "Array of strings",
   "app.editEnvironmentConfigVariables.stringType": "String",
   "app.editEnvironmentConfigVariables.variables": "Variables:",
-  "app.editEnvironmentLimitsForm.box": "Box",
-  "app.editEnvironmentLimitsForm.environment.name": "Environment name:",
-  "app.editEnvironmentLimitsForm.environment.noEnvironment": "There is currently no environment specified for this assignment.",
-  "app.editEnvironmentLimitsForm.newEnvironment": "New environment",
-  "app.editEnvironmentLimitsForm.noBoxesForPipeline": "There are no boxes which need to set limits in this pipeline.",
-  "app.editEnvironmentLimitsForm.noPipelinesForTest": "There are no pipelines for this test to edit.",
-  "app.editEnvironmentLimitsForm.pipeline": "Pipeline",
   "app.editEnvironmentLimitsForm.submit": "Save changes to {env}",
   "app.editEnvironmentLimitsForm.submitting": "Saving changes ...",
   "app.editEnvironmentLimitsForm.success": "Saved.",
@@ -242,10 +236,8 @@
   "app.editExerciseConfigEnvironment.reallyRemoveQuestion": "Do you really want to delete this runtime configuration?",
   "app.editExerciseConfigForm.addTest": "Add new test",
   "app.editExerciseConfigForm.failed": "Saving failed. Please try again later.",
-  "app.editExerciseConfigForm.fileType": "File",
   "app.editExerciseConfigForm.pipelines": "Pipelines",
   "app.editExerciseConfigForm.removeLastTest": "Remove last test",
-  "app.editExerciseConfigForm.stringType": "String",
   "app.editExerciseConfigForm.submit": "Change configuration",
   "app.editExerciseConfigForm.submitting": "Saving configuration ...",
   "app.editExerciseConfigForm.success": "Configuration was changed.",
@@ -276,24 +268,6 @@
   "app.editExerciseForm.validation.noLocalizedText": "Please add at least one localized text describing the exercise.",
   "app.editExerciseForm.validation.sameLocalizedTexts": "There are more language variants with the same locale. Please make sure locales are unique.",
   "app.editExerciseForm.validation.versionDiffers": "Somebody has changed the exercise while you have been editing it. Please reload the page and apply your changes once more.",
-  "app.editExerciseLimitsForm.failed": "Saving failed. Please try again later.",
-  "app.editExerciseLimitsForm.submit": "Change limits",
-  "app.editExerciseLimitsForm.submitting": "Saving limits ...",
-  "app.editExerciseLimitsForm.success": "Limits were saved.",
-  "app.editExerciseLimitsForm.validation.envName": "Please fill environment name.",
-  "app.editExerciseLimitsForm.validation.memoryIsNotNumer": "Memory limit must be an integer.",
-  "app.editExerciseLimitsForm.validation.memoryLimit": "Memory limit must be a positive integer.",
-  "app.editExerciseLimitsForm.validation.timeIsNotNumer": "Time limit must be a real number.",
-  "app.editExerciseLimitsForm.validation.timeLimit": "Time limit must be a positive real number.",
-  "app.editExerciseLimitsForm.validation.useDotDecimalSeparator": "Please use a dot as a decimal separator instead of the comma.",
-  "app.editExerciseRuntimeConfigsForm.failed": "Saving failed. Please try again later.",
-  "app.editExerciseRuntimeConfigsForm.submit": "Change runtime configurations",
-  "app.editExerciseRuntimeConfigsForm.submitting": "Saving runtime configurations ...",
-  "app.editExerciseRuntimeConfigsForm.success": "Runtime configurations were saved.",
-  "app.editExerciseRuntimeConfigsForm.validation.empty": "Please fill the runtime environment information.",
-  "app.editExerciseRuntimeConfigsForm.validation.jobConfig": "Please fill the job configuration of the runtime environment.",
-  "app.editExerciseRuntimeConfigsForm.validation.name": "Please fill the display name of the runtime environment.",
-  "app.editExerciseRuntimeConfigsForm.validation.runtimeEnvironmentId": "Please select a runtime environment.",
   "app.editGroup.cannotDeleteRootGroup": "This is a so-called root group and it cannot be deleted.",
   "app.editGroup.deleteGroup": "Delete the group",
   "app.editGroup.deleteGroupWarning": "Deleting a group will remove all the subgroups, the students submissions and all the assignments and the submissions of the students.",
@@ -335,14 +309,6 @@
   "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.editRuntimeConfigForm.addConfigTab": "Add new runtime configuration",
-  "app.editRuntimeConfigForm.configName": "Name of Configuration:",
-  "app.editRuntimeConfigForm.emptyConfigTabs": "There is currently no runtime configuration.",
-  "app.editRuntimeConfigForm.jobConfig": "Job Configuration:",
-  "app.editRuntimeConfigForm.moreAboutJobConfig": "Read more about <a href='https://github.com/ReCodEx/wiki/wiki/Job-configuration' target='_blank'>job configuration</a> syntax.",
-  "app.editRuntimeConfigForm.newConfig": "New configuration",
-  "app.editRuntimeConfigForm.reallyRemoveQuestion": "Do you really want to delete this runtime configuration?",
-  "app.editRuntimeConfigForm.runtimeEnvironment": "Select runtime environment:",
   "app.editUser.description": "Edit user's profile",
   "app.editUser.title": "Edit user's profile",
   "app.editUserProfile.degreesAfterName": "Degrees after name:",
@@ -355,8 +321,6 @@
   "app.editUserProfile.validation.emptyFirstName": "First name cannot be empty.",
   "app.editUserProfile.validation.emptyLastName": "Last name cannot be empty.",
   "app.editUserProfile.validation.emptyNewPassword": "New password cannot be empty if you want to change your password.",
-  "app.editUserProfile.validation.emptyOldPassword": "Old password cannot be empty if you want to change your password.",
-  "app.editUserProfile.validation.passwordTooWeak": "The password you chose is too weak, please choose a different one.",
   "app.editUserProfile.validation.passwordsDontMatch": "Passwords don't match.",
   "app.editUserProfile.validation.samePasswords": "Changing your password to the same password does not make any sense.",
   "app.editUserProfile.validation.shortFirstName": "First name must contain at least 2 characters.",
@@ -392,9 +356,7 @@
   "app.evaluationDetail.bonusPoints": "Bonus points:",
   "app.evaluationDetail.buildSucceeded": "Build succeeded:",
   "app.evaluationDetail.evaluatedAt": "Evaluated at:",
-  "app.evaluationDetail.hasFinished": "Evaluation process has finished:",
   "app.evaluationDetail.isCorrect": "Is correct:",
-  "app.evaluationDetail.isValid": "Evaluation is valid:",
   "app.evaluationDetail.score": "Score:",
   "app.evaluationDetail.title.compilationLogs": "Compilation logs",
   "app.evaluationDetail.title.details": "Evaluation details",
@@ -408,8 +370,9 @@
   "app.evaluationProgressStatus.skipped": "SKIPPED",
   "app.evaluationTable.empty": "There are no evaluations in this list.",
   "app.evaluationTable.evaluatedAt": "Evaluated at:",
+  "app.evaluationTable.notAvailable": "Evaluation not available",
+  "app.evaluationTable.score": "Score:",
   "app.evaluationTable.showDetails": "Show details",
-  "app.exercise.assign": "Assign",
   "app.exercise.assignButton": "Assign",
   "app.exercise.assignToGroup": "You can assign this exercise to one of the groups you supervise.",
   "app.exercise.author": "Author:",
@@ -428,25 +391,22 @@
   "app.exercise.editSettings": "Edit exercise settings",
   "app.exercise.exercisePipelines": "Exercise Pipelines",
   "app.exercise.forked": "Forked from:",
-  "app.exercise.group": "Group:",
+  "app.exercise.groups": "Groups:",
   "app.exercise.groupsBox": "Groups",
+  "app.exercise.isLocked": "Is locked:",
+  "app.exercise.isPublic": "Is public:",
   "app.exercise.noReferenceSolutions": "There are no reference solutions for this exercise yet.",
   "app.exercise.publicGroup": "Public",
+  "app.exercise.referenceSolution.deleteButton": "Delete",
+  "app.exercise.referenceSolution.deleteConfirm": "Are you sure you want to delete the reference solution? This cannot be undone.",
   "app.exercise.referenceSolutionDetail": "Reference solution detail",
+  "app.exercise.referenceSolutionEvaluationDescription": "Evaluation",
+  "app.exercise.referenceSolutionEvaluationDetail": "Evaluation detail",
+  "app.exercise.referenceSolutionEvaluationTitle": "Reference solution evaluation",
   "app.exercise.referenceSolutionTitle": "Reference solution overview",
   "app.exercise.referenceSolutionsBox": "Reference solutions",
   "app.exercise.runtimes": "Supported runtime environments:",
   "app.exercise.updatedAt": "Last updated at:",
-  "app.exercise.uploadReferenceSolution.createButton": "Create account",
-  "app.exercise.uploadReferenceSolution.createSuccessful": "Solution created successfully.",
-  "app.exercise.uploadReferenceSolution.creatingButtonText": "Creating solution ...",
-  "app.exercise.uploadReferenceSolution.creationFailed": "Solution was rejected by the server.",
-  "app.exercise.uploadReferenceSolution.instructions": "You must attach at least one file with source code and wait, until all your files are uploaded to the server. If there is a problem uploading any of the files, check the name of the file. The name MUST NOT contain non-standard characters (like UTF-8 ones). Then try to upload it again.",
-  "app.exercise.uploadReferenceSolution.noteLabel": "Description of the provided exercise solution",
-  "app.exercise.uploadReferenceSolution.resetFormButton": "Reset form",
-  "app.exercise.uploadReferenceSolution.runtimeConfigs": "Runtime Configuration:",
-  "app.exercise.uploadReferenceSolution.validation.emptyNote": "Description of the solution cannot be empty.",
-  "app.exercise.uploadReferenceSolution.validation.runtimeId": "Please select one of the runtime configurations.",
   "app.exercise.uploadReferenceSolutionBox": "Create reference solution",
   "app.exercise.version": "Version:",
   "app.exercises.add": "Add exercise",
@@ -465,11 +425,10 @@
   "app.exercisesList.created": "Created",
   "app.exercisesList.difficulty": "Difficulty",
   "app.exercisesList.empty": "There are no exercises in this list.",
-  "app.exercisesList.group": "Group",
+  "app.exercisesList.groups": "Groups",
   "app.exercisesList.name": "Name",
   "app.exercisesListItem.group.public": "Public",
   "app.exercisesName.loading": "Loading ...",
-  "app.exercisesSimpleList.actions": "Actions",
   "app.exercisesSimpleList.difficulty": "Difficulty",
   "app.exercisesSimpleList.empty": "There are no exercises in this list.",
   "app.exercisesSimpleList.name": "Name",
@@ -505,6 +464,7 @@
   "app.exitCodes.mono.200": "Internal error",
   "app.exitCodes.mono.201": "No main method",
   "app.exitCodes.mono.202": "More main methods",
+  "app.exitCodes.unknown": "Unknown",
   "app.externalRegistrationForm.failed": "Registration failed. Please check your information.",
   "app.externalRegistrationForm.instance": "Instance:",
   "app.externalRegistrationForm.password": "Password:",
@@ -517,6 +477,8 @@
   "app.failedGroupDetail.msg": "Cannot load group detail. Please try again later.",
   "app.failedSubmissionDetail.description": "Make sure you are connected to the Internet and repeat the action after a while.",
   "app.failedSubmissionDetail.title": "Cannot load evaluation of the solution",
+  "app.faq.description": "ReCodEx FAQ",
+  "app.faq.title": "FAQ",
   "app.feedbackAndBugs.contribution": "If you are interested in frontend web development, feel free to fix the bug itself and send a pull request! Any help will be much appreciated!",
   "app.feedbackAndBugs.description": "Ooh.. you found a bug?",
   "app.feedbackAndBugs.feedbackTitle": "How can I give you feedback?",
@@ -524,6 +486,7 @@
   "app.feedbackAndBugs.title": "Feedback and Bugs Reporting",
   "app.feedbackAndBugs.whereToReportBugs": "Where can I report bugs?",
   "app.feedbackAndBugs.whereToReportBugsText": "Every software contains bugs and we are well avare of this fact. From time to time you might find a bug that nobody else has reported and which hasn't been fixed yet. Please report all bugs to our issue tracker on GitHub - just file a new issue and give it a label 'bug'. We will try to investigate and release a bugfix as soon as possible.",
+  "app.field.isRequired": "This field is required.",
   "app.fields.limits.memory": "Test memory limit:",
   "app.fields.limits.time": "Test time limit:",
   "app.footer.copyright": "Copyright © 2016-2017 <a href=\"{website}\">ReCodEx</a>.</strong> All rights reserved.",
@@ -556,6 +519,7 @@
   "app.groupDetail.externalId": "External identification of the group:",
   "app.groupDetail.isPublic": "Is public:",
   "app.groupDetail.loading": "Loading group's description ...",
+  "app.groupDetail.subgroups": "Subgroups hierarchy",
   "app.groupDetail.supervisors": "Supervisors of {groupName}",
   "app.groupDetail.threshold": "Minimum percent of the total points count needed to complete the course:",
   "app.groupResultsTableRow.loading": "Loading results ...",
@@ -567,14 +531,12 @@
   "app.groups.makeGroupAdminButton": "Make group admin",
   "app.groups.makeSupervisorButton": "Make supervisor",
   "app.groups.removeFromGroup": "Remove from group",
+  "app.groups.removeGroupAdminButton": "Remove group admin",
   "app.groups.removeSupervisorButton": "Remove supervisor",
   "app.groupsName.loading": "Loading ...",
-  "app.hardwareGroupFields.memoryLimit": "Memory limit for \"{taskId}\":",
-  "app.hardwareGroupFields.noReferenceSolutions": "There are no reference solutions' evaluations' for test '{testName}' and its task '{taskId}'.",
-  "app.hardwareGroupFields.test": "Test:",
-  "app.hardwareGroupFields.timeLimit": "Time limit for \"{taskId}\":",
   "app.header.toggleSidebar": "Show/hide sidebar",
   "app.header.toggleSidebarSize": "Expand/minimize sidebar",
+  "app.headerNotification.copiedToClippboard": "Copied to clippboard.",
   "app.homepage.aboutAndroidApp": "We have also developed a simple Android app which can help you check new assignments and your statistics while you are on a tram or a bus.",
   "app.homepage.aboutContentP1": "ReCodEx was born in 2016 as final work for <i>Software project</i> class. It is replacement for old system CodEx used at MFF UK since 2006. The project is opensource under <a href='https://opensource.org/licenses/MIT'>MIT</a> licence hosted on <a href='https://github.com/ReCodEx'>GitHub</a>. More detailed info is on <a href='https://github.com/ReCodEx/wiki/wiki'>Wiki</a> page of the project.",
   "app.homepage.aboutContentP2": "During development was found number of <a href='https://github.com/ReCodEx/wiki/wiki/Conclusion#further-improvements'>topics</a> for following student works of different kinds. In case of interest in make this project more awesome, please contact one of the <a href='https://github.com/orgs/ReCodEx/people'>authors</a> or teachers.",
@@ -604,6 +566,7 @@
   "app.instancesTable.admin": "Admin",
   "app.instancesTable.name": "Name",
   "app.instancesTable.validLicence": "Has valid licence",
+  "app.leaveGroup.confirm": "Are you sure you want to leave this group?",
   "app.licencesTable.isValid": "Without revocation",
   "app.licencesTable.noLicences": "There are no licences.",
   "app.licencesTable.note": "Note",
@@ -615,15 +578,6 @@
   "app.login.description": "Please fill your credentials",
   "app.login.resetPassword": "Reset your password.",
   "app.login.title": "Sign in",
-  "app.loginCASForm.failed": "Login failed. Please check your credentials.",
-  "app.loginCASForm.login": "Sign in",
-  "app.loginCASForm.password": "Password:",
-  "app.loginCASForm.processing": "Signing in ...",
-  "app.loginCASForm.success": "You are successfully signed in",
-  "app.loginCASForm.title": "Sign into ReCodEx using CAS UK",
-  "app.loginCASForm.ukco": "UKCO (student's number):",
-  "app.loginCASForm.validation.emptyPassword": "Password cannot be empty.",
-  "app.loginCASForm.validation.emptyUKCO": "UKCO address cannot be empty.",
   "app.loginForm.email": "E-mail address:",
   "app.loginForm.failed": "Login failed. Please check your credentials.",
   "app.loginForm.login": "Sign in",
@@ -640,6 +594,7 @@
   "app.markdownTextArea.preview": "Preview:",
   "app.markdownTextArea.showPreview": "Show preview",
   "app.maybeBonusAssignmentIcon.isBonus": "Is Bonus",
+  "app.maybeLockedExerciseIcon.isLocked": "Exercise is locked by author and cannot be assigned",
   "app.maybePublicIcon.isNotPublic": "Is not public",
   "app.maybePublicIcon.isPublic": "Is public",
   "app.milisecondsTextField.humanReadable": "Human readable variant:",
@@ -649,10 +604,20 @@
   "app.notifications.hideAll": "Only new notifications",
   "app.notifications.showAll": "Show {count, plural, one {old notification} two {two old notifications} other {all # notifications}}",
   "app.notifications.title": "You have {count, number} new {count, plural, one {notification} two {notifications} other {notifications}}",
+  "app.page.exercises.failed": "Cannot load the list of exercises",
+  "app.page.exercises.failedDescription": "We are sorry for the inconvenience, please try again later.",
+  "app.page.exercises.loading": "Loading list of exercises ...",
+  "app.page.exercises.loadingDescription": "Please wait while we are getting the list of exercises ready.",
   "app.page.failed": "Cannot load the page",
   "app.page.failedDescription": "We are sorry for the inconvenience, please try again later.",
   "app.page.loading": "Loading ...",
   "app.page.loadingDescription": "Please wait while we are getting things ready.",
+  "app.page.pipelines.loading": "Loading list of pipelines ...",
+  "app.page.pipelines.loadingDescription": "Please wait while we are getting the list of pipelines ready.",
+  "app.page.users.failed": "Cannot load the list of users",
+  "app.page.users.failedDescription": "We are sorry for the inconvenience, please try again later.",
+  "app.page.users.loading": "Loading list of users ...",
+  "app.page.users.loadingDescription": "Please wait while we are getting the list of users ready.",
   "app.passwordStrength.bad": "Are you sure?",
   "app.passwordStrength.good": "Good",
   "app.passwordStrength.ok": "OK",
@@ -689,7 +654,6 @@
   "app.pipelineEditor.BoxForm.success": "Saved",
   "app.pipelineEditor.BoxForm.type": "Type:",
   "app.pipelineEditor.EditBoxForm.title": "Edit the box '{name}'",
-  "app.pipelineEditor.addBoxForm.portsIn": "Inputs",
   "app.pipelineFilesTable.description": "Supplementary files are files which can be referenced as remote file in pipeline configuration.",
   "app.pipelineFilesTable.title": "Supplementary files",
   "app.pipelineVisualEditor.addBoxButton": "Add box",
@@ -751,17 +715,12 @@
   "app.recodex.bugsAndFeedbackUrl": "Open ReCodEx webapp repository",
   "app.referenceSolution.author": "Author:",
   "app.referenceSolutionDetail.description": "Description",
+  "app.referenceSolutionDetail.exercise": "Exercise",
   "app.referenceSolutionDetail.refreshEvaluations": "Refresh",
   "app.referenceSolutionDetail.resubmit": "Resubmit",
   "app.referenceSolutionDetail.title.details": "Reference solution detail",
   "app.referenceSolutionDetail.uploadedAt": "Uploaded at:",
-  "app.referenceSolutionEvaluation.downloadResults": "Download results",
-  "app.referenceSolutionEvaluation.titlePrefix": "Evaluations for runtime:",
-  "app.referenceSolutionsEvaluations.description": "Description",
-  "app.referenceSolutionsEvaluations.evaluatedAt": "Evaluated on",
-  "app.referenceSolutionsEvaluations.memory": "Measured memory",
-  "app.referenceSolutionsEvaluations.time": "Measured time",
-  "app.referenceSolutionsEvaluations.title": "Reference solutions' evaluations",
+  "app.referenceSolutionEvaluation.title": "Evaluations of reference solution",
   "app.registration.description": "Start using ReCodEx today",
   "app.registration.title": "Create a new ReCodEx account",
   "app.registrationForm.createAccount": "Create account",
@@ -782,9 +741,9 @@
   "app.registrationForm.validation.emptyLastName": "Last name cannot be empty.",
   "app.registrationForm.validation.emptyPassword": "Password cannot be empty.",
   "app.registrationForm.validation.passwordDontMatch": "Passwords don't match.",
-  "app.registrationForm.validation.passwordTooWeak": "The password you chose is too weak, please choose a different one.",
   "app.registrationForm.validation.shortFirstName": "First name must contain at least 2 characters.",
   "app.registrationForm.validation.shortLastName": "Last name must contain at least 2 characters.",
+  "app.removeFromGroup.confirm": "Are you sure you want to remove the user from this group?",
   "app.resendEmailVerification.failed": "Resending failed",
   "app.resendEmailVerification.resend": "Resend verification email",
   "app.resendEmailVerification.resending": "Sending email ...",
@@ -815,6 +774,7 @@
   "app.sidebar.menu.createAccount": "Create account",
   "app.sidebar.menu.dashboard": "Dashboard",
   "app.sidebar.menu.exercises": "Exercises",
+  "app.sidebar.menu.faq": "FAQ",
   "app.sidebar.menu.feedbackAndBugs": "Feedback and bug reporting",
   "app.sidebar.menu.pipelines": "Pipelines",
   "app.sidebar.menu.signIn": "Sign in",
@@ -848,7 +808,9 @@
   "app.sisSupervisor.noSisGroups": "Currently there are no ReCodEx groups matching this SIS lecture.",
   "app.sisSupervisor.yearTerm": "Year and term:",
   "app.sourceCodeViewer.downloadButton": "Download file",
+  "app.sourceCodeViewer.incompleteWarning": "The selected source file is too large. Only a leading part of the file is displayed here. Use the download button to get the whole file.",
   "app.sourceCodeViewer.loading": "Loading ...",
+  "app.sourceCodeViewer.utf8Warning": "The source file is not a valid UTF-8 file. Some characters may be displayed incorrectly. Use the download button to see unaltered source file.",
   "app.studentsList.gainedPointsOfWithoutBreakingSpaces": "{gained, number} of {total, number}",
   "app.studentsList.noStudents": "There are no students in this list.",
   "app.studentsView.assignments": "Assignments",
@@ -910,10 +872,9 @@
   "app.sudebar.menu.admin.title": "Administration",
   "app.sudebar.menu.student.title": "Student",
   "app.sudebar.menu.supervisor.title": "Supervisor",
-  "app.supplementaryFilesTable.addFiles": "Save supplementary files",
+  "app.supplementaryFiles.deleteButton": "Delete",
+  "app.supplementaryFiles.deleteConfirm": "Are you sure you want to delete the file? This cannot be undone.",
   "app.supplementaryFilesTable.description": "Supplementary files are files which can be used in job configuration.",
-  "app.supplementaryFilesTable.empty": "There are no supplementary files attached to this exercise yet.",
-  "app.supplementaryFilesTable.fileHashName": "Hash Name",
   "app.supplementaryFilesTable.fileName": "Original filename",
   "app.supplementaryFilesTable.fileSize": "Filesize",
   "app.supplementaryFilesTable.fileUploadedAt": "Uploaded at",
@@ -933,13 +894,15 @@
   "app.user.welcomeTitle": "Welcome to ReCodEx",
   "app.userList.noSupervisors": "There are no supervisors in this list.",
   "app.userList.noUsers": "There are no users in this list.",
+  "app.userSwitching.loginAs": "Login as",
   "app.users.description": "Browse all ReCodEx users.",
   "app.users.listTitle": "Users",
   "app.users.settings": "Settings",
+  "app.users.takeOver": "Login as",
   "app.users.title": "User list",
   "app.users.users": "Users",
   "app.usersName.loading": "Loading ...",
   "app.usersName.notVerified.title": "This account does not have a verified email address yet.",
   "app.usersStats.description": "Points gained from {name}.",
   "app.usersname.notVerified.description": "This user has not verified his/her email address via an activation link he has received to his email address."
-}
+}
\ No newline at end of file
diff --git a/src/pages/Assignment/Assignment.js b/src/pages/Assignment/Assignment.js
index 02e0f5d89..f1a763b35 100644
--- a/src/pages/Assignment/Assignment.js
+++ b/src/pages/Assignment/Assignment.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage, injectIntl } from 'react-intl';
 import { Col, Row, Alert } from 'react-bootstrap';
 import Button from '../../components/widgets/FlatButton';
 import { LinkContainer } from 'react-router-bootstrap';
@@ -32,15 +32,12 @@ import {
 } from '../../redux/selectors/users';
 import { runtimeEnvironmentSelector } from '../../redux/selectors/runtimeEnvironments';
 
-import PageContent from '../../components/layout/PageContent';
+import Page from '../../components/layout/Page';
 import ResourceRenderer from '../../components/helpers/ResourceRenderer';
 import UsersNameContainer from '../../containers/UsersNameContainer';
 import { ResubmitAllSolutionsContainer } from '../../containers/ResubmitSolutionContainer';
-import AssignmentDetails, {
-  LoadingAssignmentDetails,
-  FailedAssignmentDetails
-} from '../../components/Assignments/Assignment/AssignmentDetails';
-
+import HierarchyLineContainer from '../../containers/HierarchyLineContainer';
+import AssignmentDetails from '../../components/Assignments/Assignment/AssignmentDetails';
 import { EditIcon, ResultsIcon } from '../../components/icons';
 import LocalizedTexts from '../../components/helpers/LocalizedTexts';
 import SubmitSolutionButton from '../../components/Assignments/SubmitSolutionButton';
@@ -48,6 +45,7 @@ import SubmitSolutionContainer from '../../containers/SubmitSolutionContainer';
 import SubmissionsTableContainer from '../../containers/SubmissionsTableContainer';
 
 import withLinks from '../../hoc/withLinks';
+import { getLocalizedName } from '../../helpers/getLocalizedData';
 
 class Assignment extends Component {
   static loadAsync = ({ assignmentId }, dispatch) =>
@@ -84,19 +82,17 @@ class Assignment extends Component {
       canSubmit,
       runtimeEnvironments,
       exerciseSync,
+      intl: { locale },
       links: { ASSIGNMENT_EDIT_URI_FACTORY, SUPERVISOR_STATS_URI_FACTORY }
     } = this.props;
 
     return (
-      <PageContent
-        title={
-          <ResourceRenderer resource={assignment}>
-            {assignment =>
-              <span>
-                {assignment.name}
-              </span>}
-          </ResourceRenderer>
-        }
+      <Page
+        resource={assignment}
+        title={assignment =>
+          <span>
+            {getLocalizedName(assignment, locale)}
+          </span>}
         description={
           <FormattedMessage
             id="app.assignment.title"
@@ -129,186 +125,200 @@ class Assignment extends Component {
           }
         ]}
       >
-        <ResourceRenderer
-          loading={<LoadingAssignmentDetails />}
-          failed={<FailedAssignmentDetails />}
-          resource={assignment}
-        >
-          {assignment =>
-            <div>
-              <Row>
-                <Col xs={12}>
-                  {loggedInUserId !== userId &&
-                    <p>
-                      <UsersNameContainer userId={userId} />
-                    </p>}
-                  {(isSuperAdmin || isSupervisorOf(assignment.groupId)) &&
-                    <p>
-                      <LinkContainer
-                        to={ASSIGNMENT_EDIT_URI_FACTORY(assignment.id)}
-                      >
-                        <Button bsStyle="warning">
-                          <EditIcon />{' '}
-                          <FormattedMessage
-                            id="app.assignment.editSettings"
-                            defaultMessage="Edit assignment settings"
-                          />
-                        </Button>
-                      </LinkContainer>
-                      <LinkContainer
-                        to={SUPERVISOR_STATS_URI_FACTORY(assignment.id)}
-                      >
-                        <Button bsStyle="primary">
-                          <ResultsIcon />{' '}
-                          <FormattedMessage
-                            id="app.assignment.viewResults"
-                            defaultMessage="View student results"
-                          />
-                        </Button>
-                      </LinkContainer>
-                      <ResubmitAllSolutionsContainer
-                        assignmentId={assignment.id}
-                      />
-                    </p>}
-                </Col>
-              </Row>
-              {(isSuperAdmin || isSupervisorOf(assignment.groupId)) &&
-                (!assignment.exerciseSynchronizationInfo.exerciseConfig
-                  .upToDate ||
-                  !assignment.exerciseSynchronizationInfo
-                    .exerciseEnvironmentConfigs.upToDate ||
-                  !assignment.exerciseSynchronizationInfo.hardwareGroups
-                    .upToDate ||
-                  !assignment.exerciseSynchronizationInfo.localizedTexts
-                    .upToDate ||
-                  !assignment.exerciseSynchronizationInfo.limits.upToDate) &&
-                <Row>
-                  <Col sm={12}>
-                    <Alert bsStyle="warning">
-                      <h4>
+        {assignment =>
+          <div>
+            <Row>
+              <Col xs={12}>
+                <HierarchyLineContainer groupId={assignment.groupId} />
+                {loggedInUserId !== userId &&
+                  <p>
+                    <UsersNameContainer userId={userId} />
+                  </p>}
+                {(isSuperAdmin || isSupervisorOf(assignment.groupId)) &&
+                  <p>
+                    <LinkContainer
+                      to={ASSIGNMENT_EDIT_URI_FACTORY(assignment.id)}
+                    >
+                      <Button bsStyle="warning">
+                        <EditIcon />{' '}
                         <FormattedMessage
-                          id="app.assignment.syncRequired"
-                          defaultMessage="The exercise was updated!"
+                          id="app.assignment.editSettings"
+                          defaultMessage="Edit assignment settings"
                         />
-                      </h4>
-                      <div>
+                      </Button>
+                    </LinkContainer>
+                    <LinkContainer
+                      to={SUPERVISOR_STATS_URI_FACTORY(assignment.id)}
+                    >
+                      <Button bsStyle="primary">
+                        <ResultsIcon />{' '}
                         <FormattedMessage
-                          id="app.assignment.syncDescription"
-                          defaultMessage="The exercise for this assignment was updated in following categories:"
+                          id="app.assignment.viewResults"
+                          defaultMessage="View student results"
                         />
-                        <ul>
-                          {!assignment.exerciseSynchronizationInfo
-                            .exerciseConfig.upToDate &&
-                            <li>
-                              <FormattedMessage
-                                id="app.assignment.syncExerciseConfig"
-                                defaultMessage="Exercise configuration"
-                              />
-                            </li>}
-                          {!assignment.exerciseSynchronizationInfo
-                            .exerciseEnvironmentConfigs.upToDate &&
-                            <li>
-                              <FormattedMessage
-                                id="app.assignment.syncExerciseEnvironmentConfigs"
-                                defaultMessage="Environment configuration"
-                              />
-                            </li>}
-                          {!assignment.exerciseSynchronizationInfo
-                            .hardwareGroups.upToDate &&
-                            <li>
-                              <FormattedMessage
-                                id="app.assignment.syncHardwareGroups"
-                                defaultMessage="Hardware groups"
-                              />
-                            </li>}
-                          {!assignment.exerciseSynchronizationInfo
-                            .localizedTexts.upToDate &&
-                            <li>
-                              <FormattedMessage
-                                id="app.assignment.syncLocalizedTexts"
-                                defaultMessage="Localized texts"
-                              />
-                            </li>}
-                          {!assignment.exerciseSynchronizationInfo.limits
-                            .upToDate &&
-                            <li>
-                              <FormattedMessage
-                                id="app.assignment.syncLimits"
-                                defaultMessage="Limits"
-                              />
-                            </li>}
-                        </ul>
-                      </div>
-                      <p>
-                        <Button bsStyle="primary" onClick={exerciseSync}>
-                          <FormattedMessage
-                            id="app.assignment.syncButton"
-                            defaultMessage="Update this assignment"
-                          />
-                        </Button>
-                      </p>
-                    </Alert>
-                  </Col>
-                </Row>}
+                      </Button>
+                    </LinkContainer>
+                    <ResubmitAllSolutionsContainer
+                      assignmentId={assignment.id}
+                    />
+                  </p>}
+              </Col>
+            </Row>
+            {(isSuperAdmin || isSupervisorOf(assignment.groupId)) &&
+              (!assignment.exerciseSynchronizationInfo.exerciseConfig
+                .upToDate ||
+                !assignment.exerciseSynchronizationInfo
+                  .exerciseEnvironmentConfigs.upToDate ||
+                !assignment.exerciseSynchronizationInfo.hardwareGroups
+                  .upToDate ||
+                !assignment.exerciseSynchronizationInfo.localizedTexts
+                  .upToDate ||
+                !assignment.exerciseSynchronizationInfo.limits.upToDate ||
+                !assignment.exerciseSynchronizationInfo.scoreConfig.upToDate ||
+                !assignment.exerciseSynchronizationInfo.scoreCalculator
+                  .upToDate) &&
               <Row>
-                <Col lg={6}>
-                  <div>
-                    {assignment.localizedTexts.length > 0 &&
-                      <LocalizedTexts locales={assignment.localizedTexts} />}
-                  </div>
-                </Col>
-                <ResourceRenderer resource={runtimeEnvironments}>
-                  {(...runtimes) =>
-                    <Col lg={6}>
-                      <AssignmentDetails
-                        {...assignment}
-                        isAfterFirstDeadline={this.isAfter(
-                          assignment.firstDeadline
-                        )}
-                        isAfterSecondDeadline={this.isAfter(
-                          assignment.secondDeadline
-                        )}
-                        canSubmit={canSubmit}
-                        runtimeEnvironments={runtimes}
+                <Col sm={12}>
+                  <Alert bsStyle="warning">
+                    <h4>
+                      <FormattedMessage
+                        id="app.assignment.syncRequired"
+                        defaultMessage="The exercise was updated!"
                       />
+                    </h4>
+                    <div>
+                      <FormattedMessage
+                        id="app.assignment.syncDescription"
+                        defaultMessage="The exercise for this assignment was updated in following categories:"
+                      />
+                      <ul>
+                        {!assignment.exerciseSynchronizationInfo.exerciseConfig
+                          .upToDate &&
+                          <li>
+                            <FormattedMessage
+                              id="app.assignment.syncExerciseConfig"
+                              defaultMessage="Exercise configuration"
+                            />
+                          </li>}
+                        {!assignment.exerciseSynchronizationInfo
+                          .exerciseEnvironmentConfigs.upToDate &&
+                          <li>
+                            <FormattedMessage
+                              id="app.assignment.syncExerciseEnvironmentConfigs"
+                              defaultMessage="Environment configuration"
+                            />
+                          </li>}
+                        {!assignment.exerciseSynchronizationInfo.hardwareGroups
+                          .upToDate &&
+                          <li>
+                            <FormattedMessage
+                              id="app.assignment.syncHardwareGroups"
+                              defaultMessage="Hardware groups"
+                            />
+                          </li>}
+                        {!assignment.exerciseSynchronizationInfo.localizedTexts
+                          .upToDate &&
+                          <li>
+                            <FormattedMessage
+                              id="app.assignment.syncLocalizedTexts"
+                              defaultMessage="Localized texts"
+                            />
+                          </li>}
+                        {!assignment.exerciseSynchronizationInfo.limits
+                          .upToDate &&
+                          <li>
+                            <FormattedMessage
+                              id="app.assignment.syncLimits"
+                              defaultMessage="Limits"
+                            />
+                          </li>}
+                        {!assignment.exerciseSynchronizationInfo.scoreConfig
+                          .upToDate &&
+                          <li>
+                            <FormattedMessage
+                              id="app.assignment.syncScoreConfig"
+                              defaultMessage="Score configuration"
+                            />
+                          </li>}
+                        {!assignment.exerciseSynchronizationInfo.scoreCalculator
+                          .upToDate &&
+                          <li>
+                            <FormattedMessage
+                              id="app.assignment.syncScoreCalculator"
+                              defaultMessage="Score calculator"
+                            />
+                          </li>}
+                      </ul>
+                    </div>
+                    <p>
+                      <Button bsStyle="primary" onClick={exerciseSync}>
+                        <FormattedMessage
+                          id="app.assignment.syncButton"
+                          defaultMessage="Update this assignment"
+                        />
+                      </Button>
+                    </p>
+                  </Alert>
+                </Col>
+              </Row>}
+            <Row>
+              <Col lg={6}>
+                <div>
+                  {assignment.localizedTexts.length > 0 &&
+                    <LocalizedTexts locales={assignment.localizedTexts} />}
+                </div>
+              </Col>
+              <ResourceRenderer resource={runtimeEnvironments}>
+                {(...runtimes) =>
+                  <Col lg={6}>
+                    <AssignmentDetails
+                      {...assignment}
+                      isAfterFirstDeadline={this.isAfter(
+                        assignment.firstDeadline
+                      )}
+                      isAfterSecondDeadline={this.isAfter(
+                        assignment.secondDeadline
+                      )}
+                      canSubmit={canSubmit}
+                      runtimeEnvironments={runtimes}
+                    />
 
-                      {isStudentOf(assignment.groupId) &&
-                        <div>
-                          <p className="text-center">
-                            <ResourceRenderer
-                              loading={<SubmitSolutionButton disabled={true} />}
-                              resource={canSubmit}
-                            >
-                              {canSubmit =>
-                                <SubmitSolutionButton
-                                  onClick={init(assignment.id)}
-                                  disabled={!canSubmit}
-                                />}
-                            </ResourceRenderer>
-                          </p>
-                          <SubmitSolutionContainer
-                            userId={userId}
-                            id={assignment.id}
-                            onSubmit={submitSolution}
-                            onReset={init}
-                            isOpen={submitting}
-                            runtimeEnvironments={runtimes}
-                          />
-                        </div>}
-
-                      {(isStudentOf(assignment.groupId) ||
-                        isSupervisorOf(assignment.groupId) ||
-                        isSuperAdmin) &&
-                        <SubmissionsTableContainer
+                    {isStudentOf(assignment.groupId) &&
+                      <div>
+                        <p className="text-center">
+                          <ResourceRenderer
+                            loading={<SubmitSolutionButton disabled={true} />}
+                            resource={canSubmit}
+                          >
+                            {canSubmit =>
+                              <SubmitSolutionButton
+                                onClick={init(assignment.id)}
+                                disabled={!canSubmit}
+                              />}
+                          </ResourceRenderer>
+                        </p>
+                        <SubmitSolutionContainer
                           userId={userId}
-                          assignmentId={assignment.id}
-                        />}
-                    </Col>}
-                </ResourceRenderer>
-              </Row>
-            </div>}
-        </ResourceRenderer>
-      </PageContent>
+                          id={assignment.id}
+                          onSubmit={submitSolution}
+                          onReset={init}
+                          isOpen={submitting}
+                          runtimeEnvironments={runtimes}
+                        />
+                      </div>}
+
+                    {(isStudentOf(assignment.groupId) ||
+                      isSupervisorOf(assignment.groupId) ||
+                      isSuperAdmin) &&
+                      <SubmissionsTableContainer
+                        userId={userId}
+                        assignmentId={assignment.id}
+                      />}
+                  </Col>}
+              </ResourceRenderer>
+            </Row>
+          </div>}
+      </Page>
     );
   }
 }
@@ -329,37 +339,40 @@ Assignment.propTypes = {
   loadAsync: PropTypes.func.isRequired,
   links: PropTypes.object.isRequired,
   runtimeEnvironments: PropTypes.array,
-  exerciseSync: PropTypes.func.isRequired
+  exerciseSync: PropTypes.func.isRequired,
+  intl: PropTypes.shape({ locale: PropTypes.string.isRequired }).isRequired
 };
 
-export default withLinks(
-  connect(
-    (state, { params: { assignmentId, userId } }) => {
-      const assignmentSelector = getAssignment(assignmentId);
-      const environments = runtimeEnvironmentsSelector(assignmentId)(
-        state
-      ).toJS();
-      const loggedInUserId = loggedInUserIdSelector(state);
-      userId = userId || loggedInUserId;
-      return {
-        assignment: assignmentSelector(state),
-        submitting: isSubmitting(state),
-        runtimeEnvironments: environments.map(i =>
-          runtimeEnvironmentSelector(i)(state)
-        ),
-        userId,
-        loggedInUserId,
-        isSuperAdmin: isSuperAdmin(loggedInUserId)(state),
-        isStudentOf: groupId => isStudentOf(loggedInUserId, groupId)(state),
-        isSupervisorOf: groupId =>
-          isSupervisorOf(loggedInUserId, groupId)(state),
-        canSubmit: canSubmitSolution(assignmentId)(state)
-      };
-    },
-    (dispatch, { params: { assignmentId } }) => ({
-      init: userId => () => dispatch(init(userId, assignmentId)),
-      loadAsync: () => Assignment.loadAsync({ assignmentId }, dispatch),
-      exerciseSync: () => dispatch(syncWithExercise(assignmentId))
-    })
-  )(Assignment)
+export default injectIntl(
+  withLinks(
+    connect(
+      (state, { params: { assignmentId, userId } }) => {
+        const assignmentSelector = getAssignment(assignmentId);
+        const environments = runtimeEnvironmentsSelector(assignmentId)(
+          state
+        ).toJS();
+        const loggedInUserId = loggedInUserIdSelector(state);
+        userId = userId || loggedInUserId;
+        return {
+          assignment: assignmentSelector(state),
+          submitting: isSubmitting(state),
+          runtimeEnvironments: environments.map(i =>
+            runtimeEnvironmentSelector(i)(state)
+          ),
+          userId,
+          loggedInUserId,
+          isSuperAdmin: isSuperAdmin(loggedInUserId)(state),
+          isStudentOf: groupId => isStudentOf(loggedInUserId, groupId)(state),
+          isSupervisorOf: groupId =>
+            isSupervisorOf(loggedInUserId, groupId)(state),
+          canSubmit: canSubmitSolution(assignmentId)(state)
+        };
+      },
+      (dispatch, { params: { assignmentId } }) => ({
+        init: userId => () => dispatch(init(userId, assignmentId)),
+        loadAsync: () => Assignment.loadAsync({ assignmentId }, dispatch),
+        exerciseSync: () => dispatch(syncWithExercise(assignmentId))
+      })
+    )(Assignment)
+  )
 );
diff --git a/src/pages/AssignmentStats/AssignmentStats.js b/src/pages/AssignmentStats/AssignmentStats.js
index 73ff2ef1b..f0c1bb379 100644
--- a/src/pages/AssignmentStats/AssignmentStats.js
+++ b/src/pages/AssignmentStats/AssignmentStats.js
@@ -14,6 +14,7 @@ import { fetchGroupIfNeeded } from '../../redux/modules/groups';
 
 import Page from '../../components/layout/Page';
 import ResourceRenderer from '../../components/helpers/ResourceRenderer';
+import HierarchyLineContainer from '../../containers/HierarchyLineContainer';
 
 class AssignmentStats extends Component {
   static loadAsync = ({ assignmentId }, dispatch) =>
@@ -106,6 +107,7 @@ class AssignmentStats extends Component {
       >
         {assignment =>
           <div>
+            <HierarchyLineContainer groupId={assignment.groupId} />
             <ResourceRenderer resource={getGroup(assignment.groupId)}>
               {group =>
                 <div>
diff --git a/src/pages/Dashboard/Dashboard.js b/src/pages/Dashboard/Dashboard.js
index 8c5758062..56e719d2e 100644
--- a/src/pages/Dashboard/Dashboard.js
+++ b/src/pages/Dashboard/Dashboard.js
@@ -39,7 +39,7 @@ import {
   groupsAssignmentsSelector,
   supervisorOfSelector,
   studentOfSelector,
-  groupsSelectors
+  groupsSelector
 } from '../../redux/selectors/groups';
 import { InfoIcon } from '../../components/icons';
 import { getJsData } from '../../redux/helpers/resourceManager';
@@ -362,7 +362,7 @@ export default withLinks(
         groupStatistics: groupId => createGroupsStatsSelector(groupId)(state),
         usersStatistics: statistics =>
           statistics.find(stat => stat.userId === userId) || {},
-        allGroups: groupsSelectors(state).toArray(),
+        allGroups: groupsSelector(state).toArray(),
         isAdmin: isSuperAdmin(userId)(state)
       };
     },
diff --git a/src/pages/EditAssignment/EditAssignment.js b/src/pages/EditAssignment/EditAssignment.js
index d9949fcb9..a7c65ca2b 100644
--- a/src/pages/EditAssignment/EditAssignment.js
+++ b/src/pages/EditAssignment/EditAssignment.js
@@ -6,13 +6,12 @@ import { connect } from 'react-redux';
 import { push } from 'react-router-redux';
 import { reset, getFormValues } from 'redux-form';
 import moment from 'moment';
-import PageContent from '../../components/layout/PageContent';
+import Page from '../../components/layout/Page';
 
-import ResourceRenderer from '../../components/helpers/ResourceRenderer';
 import EditAssignmentForm from '../../components/forms/EditAssignmentForm';
 import DeleteAssignmentButtonContainer from '../../containers/DeleteAssignmentButtonContainer';
 import Box from '../../components/widgets/Box';
-import { LoadingIcon, WarningIcon } from '../../components/icons';
+import HierarchyLineContainer from '../../containers/HierarchyLineContainer';
 
 import {
   fetchAssignment,
@@ -70,7 +69,8 @@ class EditAssignment extends Component {
     } = this.props;
 
     return (
-      <PageContent
+      <Page
+        resource={assignment}
         title={
           <FormattedMessage
             id="app.editAssignment.title"
@@ -95,83 +95,46 @@ class EditAssignment extends Component {
           }
         ]}
       >
-        <div>
-          <ResourceRenderer
-            loading={
-              <Box
-                title={
-                  <FormattedMessage
-                    id="app.editAssignment.loading"
-                    defaultMessage="Loading ..."
-                  />
-                }
-              >
+        {assignment =>
+          <div>
+            <HierarchyLineContainer groupId={assignment.groupId} />
+            <EditAssignmentForm
+              assignment={assignment}
+              initialValues={
+                assignment ? this.getInitialValues(assignment) : {}
+              }
+              onSubmit={formData =>
+                editAssignment(assignment.version, formData)}
+              formValues={formValues}
+            />
+
+            <br />
+            <Box
+              type="danger"
+              title={
+                <FormattedMessage
+                  id="app.editAssignment.deleteAssignment"
+                  defaultMessage="Delete the assignment"
+                />
+              }
+            >
+              <div>
                 <p>
-                  <LoadingIcon />{' '}
                   <FormattedMessage
-                    id="app.editAssignment.loadingDescription"
-                    defaultMessage="Loading latest assignment settings ..."
+                    id="app.editAssignment.deleteAssignmentWarning"
+                    defaultMessage="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."
                   />
                 </p>
-              </Box>
-            }
-            failed={
-              <Box
-                title={
-                  <FormattedMessage
-                    id="app.editAssignment.failed"
-                    defaultMessage="Failed loading assignment settings"
-                  />
-                }
-              >
-                <p>
-                  <WarningIcon />{' '}
-                  <FormattedMessage
-                    id="app.editAssignment.failedDescription"
-                    defaultMessage="Assignment settings could not have been loaded."
+                <p className="text-center">
+                  <DeleteAssignmentButtonContainer
+                    id={assignmentId}
+                    onDeleted={() => push(GROUP_URI_FACTORY(this.groupId))}
                   />
                 </p>
-              </Box>
-            }
-            resource={assignment}
-          >
-            {data =>
-              <div>
-                <EditAssignmentForm
-                  assignment={data}
-                  initialValues={data ? this.getInitialValues(data) : {}}
-                  onSubmit={formData => editAssignment(data.version, formData)}
-                  formValues={formValues}
-                />
-              </div>}
-          </ResourceRenderer>
-          <br />
-          <Box
-            type="danger"
-            title={
-              <FormattedMessage
-                id="app.editAssignment.deleteAssignment"
-                defaultMessage="Delete the assignment"
-              />
-            }
-          >
-            <div>
-              <p>
-                <FormattedMessage
-                  id="app.editAssignment.deleteAssignmentWarning"
-                  defaultMessage="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."
-                />
-              </p>
-              <p className="text-center">
-                <DeleteAssignmentButtonContainer
-                  id={assignmentId}
-                  onDeleted={() => push(GROUP_URI_FACTORY(this.groupId))}
-                />
-              </p>
-            </div>
-          </Box>
-        </div>
-      </PageContent>
+              </div>
+            </Box>
+          </div>}
+      </Page>
     );
   }
 }
diff --git a/src/pages/EditExercise/EditExercise.js b/src/pages/EditExercise/EditExercise.js
index abe40cb7a..8f3515e6c 100644
--- a/src/pages/EditExercise/EditExercise.js
+++ b/src/pages/EditExercise/EditExercise.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage, injectIntl } from 'react-intl';
 import { Row, Col } from 'react-bootstrap';
 import { connect } from 'react-redux';
 import { push } from 'react-router-redux';
@@ -9,7 +9,6 @@ import { reset, getFormValues } from 'redux-form';
 
 import Page from '../../components/layout/Page';
 import Box from '../../components/widgets/Box';
-
 import EditExerciseForm from '../../components/forms/EditExerciseForm';
 import AdditionalExerciseFilesTableContainer from '../../containers/AdditionalExerciseFilesTableContainer';
 import DeleteExerciseButtonContainer from '../../containers/DeleteExerciseButtonContainer';
@@ -23,6 +22,7 @@ import { isSubmitting } from '../../redux/selectors/submission';
 import { loggedInUserIdSelector } from '../../redux/selectors/auth';
 
 import withLinks from '../../hoc/withLinks';
+import { getLocalizedName } from '../../helpers/getLocalizedData';
 
 class EditExercise extends Component {
   componentWillMount = () => this.props.loadAsync();
@@ -43,13 +43,14 @@ class EditExercise extends Component {
       exercise,
       editExercise,
       formValues,
-      push
+      push,
+      intl: { locale }
     } = this.props;
 
     return (
       <Page
         resource={exercise}
-        title={exercise => exercise.name}
+        title={exercise => getLocalizedName(exercise, locale)}
         description={
           <FormattedMessage
             id="app.editExercise.description"
@@ -59,12 +60,14 @@ class EditExercise extends Component {
         breadcrumbs={[
           {
             resource: exercise,
-            breadcrumb: ({ name }) => ({
+            breadcrumb: ({ name, localizedTexts }) => ({
               text: (
                 <FormattedMessage
                   id="app.exercise.breadcrumbTitle"
                   defaultMessage="Exercise {name}"
-                  values={{ name }}
+                  values={{
+                    name: getLocalizedName({ name, localizedTexts }, locale)
+                  }}
                 />
               ),
               iconName: 'puzzle-piece',
@@ -142,25 +145,28 @@ EditExercise.propTypes = {
   }).isRequired,
   formValues: PropTypes.object,
   links: PropTypes.object.isRequired,
-  push: PropTypes.func.isRequired
+  push: PropTypes.func.isRequired,
+  intl: PropTypes.shape({ locale: PropTypes.string.isRequired }).isRequired
 };
 
-export default withLinks(
-  connect(
-    (state, { params: { exerciseId } }) => {
-      return {
-        exercise: getExercise(exerciseId)(state),
-        submitting: isSubmitting(state),
-        userId: loggedInUserIdSelector(state),
-        formValues: getFormValues('editExercise')(state)
-      };
-    },
-    (dispatch, { params: { exerciseId } }) => ({
-      push: url => dispatch(push(url)),
-      reset: () => dispatch(reset('editExercise')),
-      loadAsync: () => EditExercise.loadAsync({ exerciseId }, dispatch),
-      editExercise: (version, data) =>
-        dispatch(editExercise(exerciseId, { ...data, version }))
-    })
-  )(EditExercise)
+export default injectIntl(
+  withLinks(
+    connect(
+      (state, { params: { exerciseId } }) => {
+        return {
+          exercise: getExercise(exerciseId)(state),
+          submitting: isSubmitting(state),
+          userId: loggedInUserIdSelector(state),
+          formValues: getFormValues('editExercise')(state)
+        };
+      },
+      (dispatch, { params: { exerciseId } }) => ({
+        push: url => dispatch(push(url)),
+        reset: () => dispatch(reset('editExercise')),
+        loadAsync: () => EditExercise.loadAsync({ exerciseId }, dispatch),
+        editExercise: (version, data) =>
+          dispatch(editExercise(exerciseId, { ...data, version }))
+      })
+    )(EditExercise)
+  )
 );
diff --git a/src/pages/EditExerciseConfig/EditExerciseConfig.js b/src/pages/EditExerciseConfig/EditExerciseConfig.js
index 261186d96..0efc1f8e7 100644
--- a/src/pages/EditExerciseConfig/EditExerciseConfig.js
+++ b/src/pages/EditExerciseConfig/EditExerciseConfig.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage, injectIntl } from 'react-intl';
 import { Row, Col } from 'react-bootstrap';
 import { connect } from 'react-redux';
 import { getFormValues } from 'redux-form';
@@ -12,6 +12,7 @@ import ResourceRenderer from '../../components/helpers/ResourceRenderer';
 
 import EditExerciseConfigForm from '../../components/forms/EditExerciseConfigForm/EditExerciseConfigForm';
 import EditEnvironmentConfigForm from '../../components/forms/EditEnvironmentConfigForm';
+import EditScoreConfigForm from '../../components/forms/EditScoreConfigForm';
 import EditSimpleLimitsBox from '../../components/Exercises/EditSimpleLimitsBox';
 
 import SupplementaryFilesTableContainer from '../../containers/SupplementaryFilesTableContainer';
@@ -29,6 +30,10 @@ import {
   fetchExerciseConfigIfNeeded,
   setExerciseConfig
 } from '../../redux/modules/exerciseConfigs';
+import {
+  fetchScoreConfigIfNeeded,
+  setScoreConfig
+} from '../../redux/modules/exerciseScoreConfig';
 import {
   fetchExerciseEnvironmentConfigIfNeeded,
   setExerciseEnvironmentConfig
@@ -37,12 +42,14 @@ import { getExercise } from '../../redux/selectors/exercises';
 import { pipelinesSelector } from '../../redux/selectors/pipelines';
 import { exerciseConfigSelector } from '../../redux/selectors/exerciseConfigs';
 import { exerciseEnvironmentConfigSelector } from '../../redux/selectors/exerciseEnvironmentConfigs';
+import { exerciseScoreConfigSelector } from '../../redux/selectors/exerciseScoreConfig';
 import { loggedInUserIdSelector } from '../../redux/selectors/auth';
 import { fetchRuntimeEnvironments } from '../../redux/modules/runtimeEnvironments';
 import { runtimeEnvironmentsSelector } from '../../redux/selectors/runtimeEnvironments';
 import { simpleLimitsSelector } from '../../redux/selectors/simpleLimits';
 
 import withLinks from '../../hoc/withLinks';
+import { getLocalizedName } from '../../helpers/getLocalizedData';
 
 class EditExerciseConfig extends Component {
   componentWillMount = () => this.props.loadAsync();
@@ -69,7 +76,8 @@ class EditExerciseConfig extends Component {
       dispatch(fetchExerciseConfigIfNeeded(exerciseId)),
       dispatch(fetchRuntimeEnvironments()),
       dispatch(fetchExerciseEnvironmentConfigIfNeeded(exerciseId)),
-      dispatch(fetchPipelines())
+      dispatch(fetchPipelines()),
+      dispatch(fetchScoreConfigIfNeeded(exerciseId))
     ]);
 
   render() {
@@ -83,18 +91,21 @@ class EditExerciseConfig extends Component {
       environmentFormValues,
       exerciseConfig,
       exerciseEnvironmentConfig,
+      exerciseScoreConfig,
       editEnvironmentSimpleLimits,
       pipelines,
       limits,
       setHorizontally,
       setVertically,
-      setAll
+      setAll,
+      editScoreConfig,
+      intl: { locale }
     } = this.props;
 
     return (
       <Page
         resource={exercise}
-        title={exercise => exercise.name}
+        title={exercise => getLocalizedName(exercise, locale)}
         description={
           <FormattedMessage
             id="app.editExerciseConfig.description"
@@ -104,12 +115,14 @@ class EditExerciseConfig extends Component {
         breadcrumbs={[
           {
             resource: exercise,
-            breadcrumb: ({ name }) => ({
+            breadcrumb: ({ name, localizedTexts }) => ({
               text: (
                 <FormattedMessage
                   id="app.exercise.breadcrumbTitle"
                   defaultMessage="Exercise {name}"
-                  values={{ name }}
+                  values={{
+                    name: getLocalizedName({ name, localizedTexts }, locale)
+                  }}
                 />
               ),
               iconName: 'puzzle-piece',
@@ -157,6 +170,27 @@ class EditExerciseConfig extends Component {
                 </Box>
               </Col>
             </Row>
+            <Row>
+              <Col lg={6}>
+                <Box
+                  title={
+                    <FormattedMessage
+                      id="app.editExercise.editScoreConfig"
+                      defaultMessage="Edit score configurations"
+                    />
+                  }
+                  unlimitedHeight
+                >
+                  <ResourceRenderer resource={exerciseScoreConfig}>
+                    {config =>
+                      <EditScoreConfigForm
+                        onSubmit={editScoreConfig}
+                        initialValues={{ scoreConfig: config }}
+                      />}
+                  </ResourceRenderer>
+                </Box>
+              </Col>
+            </Row>
             <br />
             <Row>
               <Col lg={12}>
@@ -203,51 +237,65 @@ EditExerciseConfig.propTypes = {
   environmentFormValues: PropTypes.object,
   exerciseConfig: PropTypes.object,
   exerciseEnvironmentConfig: PropTypes.object,
+  exerciseScoreConfig: PropTypes.object,
   editEnvironmentSimpleLimits: PropTypes.func.isRequired,
   pipelines: ImmutablePropTypes.map,
   links: PropTypes.object.isRequired,
   limits: PropTypes.func.isRequired,
   setHorizontally: PropTypes.func.isRequired,
   setVertically: PropTypes.func.isRequired,
-  setAll: PropTypes.func.isRequired
+  setAll: PropTypes.func.isRequired,
+  editScoreConfig: PropTypes.func.isRequired,
+  intl: PropTypes.shape({ locale: PropTypes.string.isRequired }).isRequired
 };
 
-export default withLinks(
-  connect(
-    (state, { params: { exerciseId } }) => {
-      return {
-        exercise: getExercise(exerciseId)(state),
-        userId: loggedInUserIdSelector(state),
-        environmentFormValues: getFormValues('editEnvironmentConfig')(state),
-        runtimeEnvironments: runtimeEnvironmentsSelector(state),
-        exerciseConfig: exerciseConfigSelector(exerciseId)(state),
-        exerciseEnvironmentConfig: exerciseEnvironmentConfigSelector(
-          exerciseId
-        )(state),
-        pipelines: pipelinesSelector(state),
-        limits: runtimeEnvironmentId =>
-          simpleLimitsSelector(exerciseId, runtimeEnvironmentId)(state)
-      };
-    },
-    (dispatch, { params: { exerciseId } }) => ({
-      loadAsync: () => EditExerciseConfig.loadAsync({ exerciseId }, dispatch),
-      editEnvironmentConfigs: data =>
-        dispatch(setExerciseEnvironmentConfig(exerciseId, data)),
-      editEnvironmentSimpleLimits: runtimeEnvironmentId => data =>
-        dispatch(
-          editEnvironmentSimpleLimits(exerciseId, runtimeEnvironmentId, data)
-        ),
-      setConfig: data => dispatch(setExerciseConfig(exerciseId, data)),
-      setHorizontally: (formName, runtimeEnvironmentId) => testName => () =>
-        dispatch(
-          setHorizontally(formName, exerciseId, runtimeEnvironmentId, testName)
-        ),
-      setVertically: (formName, runtimeEnvironmentId) => testName => () =>
-        dispatch(
-          setVertically(formName, exerciseId, runtimeEnvironmentId, testName)
-        ),
-      setAll: (formName, runtimeEnvironmentId) => testName => () =>
-        dispatch(setAll(formName, exerciseId, runtimeEnvironmentId, testName))
-    })
-  )(EditExerciseConfig)
+export default injectIntl(
+  withLinks(
+    connect(
+      (state, { params: { exerciseId } }) => {
+        return {
+          exercise: getExercise(exerciseId)(state),
+          userId: loggedInUserIdSelector(state),
+          environmentFormValues: getFormValues('editEnvironmentConfig')(state),
+          runtimeEnvironments: runtimeEnvironmentsSelector(state),
+          exerciseConfig: exerciseConfigSelector(exerciseId)(state),
+          exerciseScoreConfig: exerciseScoreConfigSelector(exerciseId)(state),
+          exerciseEnvironmentConfig: exerciseEnvironmentConfigSelector(
+            exerciseId
+          )(state),
+          pipelines: pipelinesSelector(state),
+          limits: runtimeEnvironmentId =>
+            simpleLimitsSelector(exerciseId, runtimeEnvironmentId)(state)
+        };
+      },
+      (dispatch, { params: { exerciseId } }) => ({
+        loadAsync: () => EditExerciseConfig.loadAsync({ exerciseId }, dispatch),
+        editEnvironmentConfigs: data =>
+          dispatch(setExerciseEnvironmentConfig(exerciseId, data)),
+        editEnvironmentSimpleLimits: runtimeEnvironmentId => data =>
+          dispatch(
+            editEnvironmentSimpleLimits(exerciseId, runtimeEnvironmentId, data)
+          ),
+        setConfig: data => dispatch(setExerciseConfig(exerciseId, data)),
+        setHorizontally: (formName, runtimeEnvironmentId) => testName => () =>
+          dispatch(
+            setHorizontally(
+              formName,
+              exerciseId,
+              runtimeEnvironmentId,
+              testName
+            )
+          ),
+        setVertically: (formName, runtimeEnvironmentId) => testName => () =>
+          dispatch(
+            setVertically(formName, exerciseId, runtimeEnvironmentId, testName)
+          ),
+        setAll: (formName, runtimeEnvironmentId) => testName => () =>
+          dispatch(
+            setAll(formName, exerciseId, runtimeEnvironmentId, testName)
+          ),
+        editScoreConfig: data => dispatch(setScoreConfig(exerciseId, data))
+      })
+    )(EditExerciseConfig)
+  )
 );
diff --git a/src/pages/Exercise/Exercise.js b/src/pages/Exercise/Exercise.js
index ba551e783..c94696f08 100644
--- a/src/pages/Exercise/Exercise.js
+++ b/src/pages/Exercise/Exercise.js
@@ -29,12 +29,14 @@ import {
 } from '../../components/icons';
 import Confirm from '../../components/forms/Confirm';
 import PipelinesSimpleList from '../../components/Pipelines/PipelinesSimpleList';
-
-import ForkExerciseButtonContainer from '../../containers/ForkExerciseButtonContainer';
+// import ForkExerciseForm from '../../components/forms/ForkExerciseForm';
 import AssignExerciseButton from '../../components/buttons/AssignExerciseButton';
 
 import { isSubmitting } from '../../redux/selectors/submission';
-import { fetchExerciseIfNeeded } from '../../redux/modules/exercises';
+import {
+  fetchExerciseIfNeeded,
+  forkExercise
+} from '../../redux/modules/exercises';
 import {
   fetchReferenceSolutionsIfNeeded,
   deleteReferenceSolution
@@ -51,12 +53,16 @@ import {
   create as createPipeline
 } from '../../redux/modules/pipelines';
 import { exercisePipelinesSelector } from '../../redux/selectors/pipelines';
+import { fetchUsersGroupsIfNeeded } from '../../redux/modules/groups';
 
 import { loggedInUserIdSelector } from '../../redux/selectors/auth';
-import { supervisorOfSelector } from '../../redux/selectors/groups';
+import {
+  supervisorOfSelector,
+  groupsSelector
+} from '../../redux/selectors/groups';
 
-import { clientOnly } from '../../helpers/clientOnly';
 import withLinks from '../../hoc/withLinks';
+import { getLocalizedName } from '../../helpers/getLocalizedData';
 
 const messages = defineMessages({
   groupsBox: {
@@ -76,22 +82,23 @@ const messages = defineMessages({
 class Exercise extends Component {
   state = { forkId: null };
 
-  static loadAsync = (dispatch, exerciseId) =>
+  static loadAsync = ({ exerciseId }, dispatch, userId) =>
     Promise.all([
       dispatch(fetchExerciseIfNeeded(exerciseId)),
       dispatch(fetchReferenceSolutionsIfNeeded(exerciseId)),
       dispatch(fetchHardwareGroups()),
-      dispatch(fetchExercisePipelines(exerciseId))
+      dispatch(fetchExercisePipelines(exerciseId)),
+      dispatch(fetchUsersGroupsIfNeeded(userId))
     ]);
 
   componentWillMount() {
-    this.props.loadAsync();
+    this.props.loadAsync(this.props.userId);
     this.reset();
   }
 
   componentWillReceiveProps(newProps) {
     if (this.props.params.exerciseId !== newProps.params.exerciseId) {
-      newProps.loadAsync();
+      newProps.loadAsync(this.props.userId);
       this.reset();
     }
   }
@@ -128,14 +135,16 @@ class Exercise extends Component {
       supervisedGroups,
       canEditExercise,
       referenceSolutions,
-      intl: { formatMessage },
+      intl: { formatMessage, locale },
       initCreateReferenceSolution,
       exercisePipelines,
       deleteReferenceSolution,
       push
+      // groups,
+      // forkExercise
     } = this.props;
 
-    const { forkId } = this.state;
+    // const { forkId } = this.state;
 
     const {
       links: {
@@ -149,7 +158,7 @@ class Exercise extends Component {
 
     return (
       <Page
-        title={exercise => exercise.name}
+        title={exercise => getLocalizedName(exercise, locale)}
         resource={exercise}
         description={
           <FormattedMessage
@@ -210,11 +219,13 @@ class Exercise extends Component {
                           />
                         </Button>
                       </LinkContainer>
+                      {/* <ForkExerciseForm
+                        exerciseId={exercise.id}
+                        groups={groups}
+                        forkId={forkId}
+                        onSubmit={formData => forkExercise(forkId, formData)}
+                      /> */}
                     </ButtonGroup>
-                    <ForkExerciseButtonContainer
-                      exerciseId={exercise.id}
-                      forkId={forkId}
-                    />
                   </div>}
                 <p />
               </Col>
@@ -326,7 +337,7 @@ class Exercise extends Component {
                 </Box>
               </Col>
               <Col lg={6}>
-                <ExerciseDetail {...exercise} />
+                <ExerciseDetail {...exercise} locale={locale} />
                 <Box
                   title={formatMessage(messages.referenceSolutionsBox)}
                   noPadding
@@ -446,7 +457,9 @@ Exercise.propTypes = {
   exercisePipelines: ImmutablePropTypes.map,
   createExercisePipeline: PropTypes.func,
   links: PropTypes.object,
-  deleteReferenceSolution: PropTypes.func.isRequired
+  deleteReferenceSolution: PropTypes.func.isRequired,
+  forkExercise: PropTypes.func.isRequired,
+  groups: ImmutablePropTypes.map
 };
 
 export default withLinks(
@@ -463,12 +476,13 @@ export default withLinks(
           canEditExercise: exerciseId =>
             canEditExercise(userId, exerciseId)(state),
           referenceSolutions: referenceSolutionsSelector(exerciseId)(state),
-          exercisePipelines: exercisePipelinesSelector(exerciseId)(state)
+          exercisePipelines: exercisePipelinesSelector(exerciseId)(state),
+          groups: groupsSelector(state)
         };
       },
       (dispatch, { params: { exerciseId } }) => ({
-        loadAsync: () =>
-          clientOnly(() => Exercise.loadAsync(dispatch, exerciseId)),
+        loadAsync: userId =>
+          Exercise.loadAsync({ exerciseId }, dispatch, userId),
         assignExercise: groupId =>
           dispatch(assignExercise(groupId, exerciseId)),
         push: url => dispatch(push(url)),
@@ -477,7 +491,9 @@ export default withLinks(
         createExercisePipeline: () =>
           dispatch(createPipeline({ exerciseId: exerciseId })),
         deleteReferenceSolution: (exerciseId, solutionId) =>
-          dispatch(deleteReferenceSolution(exerciseId, solutionId))
+          dispatch(deleteReferenceSolution(exerciseId, solutionId)),
+        forkExercise: (forkId, data) =>
+          dispatch(forkExercise(exerciseId, forkId, data))
       })
     )(Exercise)
   )
diff --git a/src/pages/Group/Group.js b/src/pages/Group/Group.js
index 45cb90b4d..25da87fda 100644
--- a/src/pages/Group/Group.js
+++ b/src/pages/Group/Group.js
@@ -7,7 +7,6 @@ import { LinkContainer } from 'react-router-bootstrap';
 import Button from '../../components/widgets/FlatButton';
 import { FormattedMessage } from 'react-intl';
 import { List, Map } from 'immutable';
-import { Well } from 'react-bootstrap';
 
 import Page from '../../components/layout/Page';
 import GroupDetail, {
@@ -18,8 +17,8 @@ import LeaveJoinGroupButtonContainer from '../../containers/LeaveJoinGroupButton
 import AdminsView from '../../components/Groups/AdminsView';
 import SupervisorsView from '../../components/Groups/SupervisorsView';
 import StudentsView from '../../components/Groups/StudentsView';
+import HierarchyLine from '../../components/Groups/HierarchyLine';
 import { EditIcon } from '../../components/icons';
-import GroupsNameContainer from '../../containers/GroupsNameContainer';
 
 import { isReady, getJsData } from '../../redux/helpers/resourceManager';
 import {
@@ -50,7 +49,7 @@ import {
 
 import {
   groupSelector,
-  groupsSelectors,
+  groupsSelector,
   groupsAssignmentsSelector,
   supervisorsOfGroup,
   studentsOfGroup
@@ -63,7 +62,6 @@ import { fetchInstanceIfNeeded } from '../../redux/modules/instances';
 import { instanceSelector } from '../../redux/selectors/instances';
 
 import withLinks from '../../hoc/withLinks';
-import './Group.css';
 
 class Group extends Component {
   static isAdminOrSupervisorOf = (group, userId) =>
@@ -203,19 +201,11 @@ class Group extends Component {
       >
         {data =>
           <div>
-            <Well bsSize="sm" className="groupParents">
-              {data.parentGroupsIds.map(
-                (groupId, i) =>
-                  i !== 0 &&
-                  <span key={i}>
-                    <GroupsNameContainer groupId={groupId} />{' '}
-                    <span style={{ margin: '0 5px', color: '#aaa' }}>/</span>
-                  </span>
-              )}
-              <GroupsNameContainer groupId={data.id} noLink />
-            </Well>
-
-            {data.parentGroupsIds.length > 1 && <p />}
+            <HierarchyLine
+              groupId={data.id}
+              parentGroupsIds={data.parentGroupsIds}
+            />
+            <p />
             {(isAdmin || isSuperAdmin) &&
               <p>
                 <LinkContainer to={GROUP_EDIT_URI_FACTORY(data.id)}>
@@ -327,7 +317,7 @@ const mapStateToProps = (state, { params: { groupId } }) => {
     instance: isReady(group)
       ? instanceSelector(state, groupData.instanceId)
       : null,
-    groups: groupsSelectors(state),
+    groups: groupsSelector(state),
     publicGroups: publicGroupsSelectors(state),
     publicAssignments: groupsAssignmentsSelector(groupId, 'public')(state),
     allAssignments: groupsAssignmentsSelector(groupId, 'all')(state),
diff --git a/src/pages/Pipeline/Pipeline.js b/src/pages/Pipeline/Pipeline.js
index b95245566..97966f5ef 100644
--- a/src/pages/Pipeline/Pipeline.js
+++ b/src/pages/Pipeline/Pipeline.js
@@ -103,32 +103,30 @@ class Pipeline extends Component {
       >
         {pipeline =>
           <div>
+            <div>
+              <ButtonGroup>
+                {isAuthorOfPipeline(pipeline.id) &&
+                  <LinkContainer to={PIPELINE_EDIT_URI_FACTORY(pipeline.id)}>
+                    <Button bsStyle="warning" bsSize="sm">
+                      <EditIcon />
+                      &nbsp;
+                      <FormattedMessage
+                        id="app.pipeline.editSettings"
+                        defaultMessage="Edit pipeline"
+                      />
+                    </Button>
+                  </LinkContainer>}
+                <ForkPipelineForm
+                  pipelineId={pipeline.id}
+                  exercises={exercises}
+                  forkId={forkId}
+                  onSubmit={formData => forkPipeline(forkId, formData)}
+                />
+              </ButtonGroup>
+            </div>
+            <p />
             <Row>
               <Col lg={6}>
-                <div>
-                  <ButtonGroup>
-                    {isAuthorOfPipeline(pipeline.id) &&
-                      <LinkContainer
-                        to={PIPELINE_EDIT_URI_FACTORY(pipeline.id)}
-                      >
-                        <Button bsStyle="warning" bsSize="sm">
-                          <EditIcon />
-                          &nbsp;
-                          <FormattedMessage
-                            id="app.pipeline.editSettings"
-                            defaultMessage="Edit pipeline"
-                          />
-                        </Button>
-                      </LinkContainer>}
-                    <ForkPipelineForm
-                      pipelineId={pipeline.id}
-                      exercises={exercises}
-                      forkId={this.state.forkId}
-                      onSubmit={formData => forkPipeline(forkId, formData)}
-                    />
-                  </ButtonGroup>
-                </div>
-                <p />
                 <PipelineDetail {...pipeline} />
               </Col>
               <Col lg={6}>
diff --git a/src/pages/ReferenceSolution/ReferenceSolution.js b/src/pages/ReferenceSolution/ReferenceSolution.js
index 6371744a1..36c6a9787 100644
--- a/src/pages/ReferenceSolution/ReferenceSolution.js
+++ b/src/pages/ReferenceSolution/ReferenceSolution.js
@@ -12,7 +12,6 @@ import { Row, Col, Button } from 'react-bootstrap';
 
 import withLinks from '../../hoc/withLinks';
 import Page from '../../components/layout/Page';
-import { clientOnly } from '../../helpers/clientOnly';
 
 import {
   fetchReferenceSolutionsIfNeeded,
@@ -212,8 +211,7 @@ export default withLinks(
         referenceSolutions: referenceSolutionsSelector(exerciseId)(state)
       }),
       (dispatch, { params }) => ({
-        loadAsync: () =>
-          clientOnly(() => ReferenceSolution.loadAsync(params, dispatch)),
+        loadAsync: () => ReferenceSolution.loadAsync(params, dispatch),
         refreshSolutionEvaluations: () => {
           dispatch(fetchReferenceSolutions(params.exerciseId));
         },
diff --git a/src/pages/ReferenceSolutionEvaluation/ReferenceSolutionEvaluation.js b/src/pages/ReferenceSolutionEvaluation/ReferenceSolutionEvaluation.js
index cc0ea5fd7..165bbe427 100644
--- a/src/pages/ReferenceSolutionEvaluation/ReferenceSolutionEvaluation.js
+++ b/src/pages/ReferenceSolutionEvaluation/ReferenceSolutionEvaluation.js
@@ -11,7 +11,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 
 import withLinks from '../../hoc/withLinks';
 import Page from '../../components/layout/Page';
-import { clientOnly } from '../../helpers/clientOnly';
 
 import { fetchReferenceSolutionsIfNeeded } from '../../redux/modules/referenceSolutions';
 import { referenceSolutionsSelector } from '../../redux/selectors/referenceSolutions';
@@ -162,9 +161,7 @@ export default withLinks(
       }),
       (dispatch, { params }) => ({
         loadAsync: () =>
-          clientOnly(() =>
-            ReferenceSolutionEvaluation.loadAsync(params, dispatch)
-          ),
+          ReferenceSolutionEvaluation.loadAsync(params, dispatch),
         downloadEvaluationArchive: e => {
           e.preventDefault();
           dispatch(downloadEvaluationArchive(params.evaluationId));
diff --git a/src/pages/Submission/Submission.js b/src/pages/Submission/Submission.js
index a2eca7c84..5cc2aac8f 100644
--- a/src/pages/Submission/Submission.js
+++ b/src/pages/Submission/Submission.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage, injectIntl } from 'react-intl';
 
 import Page from '../../components/layout/Page';
 import ResourceRenderer from '../../components/helpers/ResourceRenderer';
@@ -10,6 +10,7 @@ import SubmissionDetail, {
 } from '../../components/Submissions/SubmissionDetail';
 import AcceptSolutionContainer from '../../containers/AcceptSolutionContainer';
 import ResubmitSolutionContainer from '../../containers/ResubmitSolutionContainer';
+import HierarchyLineContainer from '../../containers/HierarchyLineContainer';
 
 import { fetchGroupsStats } from '../../redux/modules/stats';
 import { fetchAssignmentIfNeeded } from '../../redux/modules/assignments';
@@ -22,7 +23,7 @@ import {
   isSuperAdmin
 } from '../../redux/selectors/users';
 import { loggedInUserIdSelector } from '../../redux/selectors/auth';
-import { clientOnly } from '../../helpers/clientOnly';
+import { getLocalizedName } from '../../helpers/getLocalizedData';
 
 class Submission extends Component {
   static loadAsync = ({ submissionId, assignmentId }, dispatch) =>
@@ -48,13 +49,14 @@ class Submission extends Component {
       assignment,
       submission,
       params: { assignmentId },
-      isSupervisorOrMore
+      isSupervisorOrMore,
+      intl: { locale }
     } = this.props;
 
     return (
       <Page
         resource={assignment}
-        title={assignment => assignment.name}
+        title={assignment => getLocalizedName(assignment, locale)}
         description={
           <FormattedMessage
             id="app.submission.evaluation.title"
@@ -104,6 +106,7 @@ class Submission extends Component {
         >
           {(submission, assignment) =>
             <div>
+              <HierarchyLineContainer groupId={assignment.groupId} />
               {isSupervisorOrMore(assignment.groupId) &&
                 <p>
                   <AcceptSolutionContainer id={submission.id} />
@@ -133,19 +136,22 @@ Submission.propTypes = {
   children: PropTypes.element,
   submission: PropTypes.object,
   loadAsync: PropTypes.func.isRequired,
-  isSupervisorOrMore: PropTypes.func.isRequired
+  isSupervisorOrMore: PropTypes.func.isRequired,
+  intl: PropTypes.shape({ locale: PropTypes.string.isRequired }).isRequired
 };
 
-export default connect(
-  (state, { params: { submissionId, assignmentId } }) => ({
-    submission: getSubmission(submissionId)(state),
-    assignment: getAssignment(assignmentId)(state),
-    isSupervisorOrMore: groupId =>
-      isSupervisorOf(loggedInUserIdSelector(state), groupId)(state) ||
-      isAdminOf(loggedInUserIdSelector(state), groupId)(state) ||
-      isSuperAdmin(loggedInUserIdSelector(state))(state)
-  }),
-  (dispatch, { params }) => ({
-    loadAsync: () => clientOnly(() => Submission.loadAsync(params, dispatch))
-  })
-)(Submission);
+export default injectIntl(
+  connect(
+    (state, { params: { submissionId, assignmentId } }) => ({
+      submission: getSubmission(submissionId)(state),
+      assignment: getAssignment(assignmentId)(state),
+      isSupervisorOrMore: groupId =>
+        isSupervisorOf(loggedInUserIdSelector(state), groupId)(state) ||
+        isAdminOf(loggedInUserIdSelector(state), groupId)(state) ||
+        isSuperAdmin(loggedInUserIdSelector(state))(state)
+    }),
+    (dispatch, { params }) => ({
+      loadAsync: () => Submission.loadAsync(params, dispatch)
+    })
+  )(Submission)
+);
diff --git a/src/redux/middleware/loggerMiddleware.js b/src/redux/middleware/loggerMiddleware.js
new file mode 100644
index 000000000..90c982d7f
--- /dev/null
+++ b/src/redux/middleware/loggerMiddleware.js
@@ -0,0 +1,20 @@
+const middleware = store => next => action => {
+  let verbose = false;
+  if (verbose) {
+    console.log(action);
+  } else {
+    console.log(action.type);
+  }
+
+  let res = next(action);
+
+  if (verbose) {
+    console.log('State After Actions:');
+    console.log('--------------------');
+    console.log(store.getState().assignments);
+  }
+
+  return res;
+};
+
+export default middleware;
diff --git a/src/redux/modules/exerciseScoreConfig.js b/src/redux/modules/exerciseScoreConfig.js
new file mode 100644
index 000000000..204230209
--- /dev/null
+++ b/src/redux/modules/exerciseScoreConfig.js
@@ -0,0 +1,19 @@
+import { handleActions } from 'redux-actions';
+import factory, { initialState } from '../helpers/resourceManager';
+
+/**
+ * Create actions & reducer
+ */
+
+const resourceName = 'exerciseScoreConfig';
+const { actions, reduceActions } = factory({
+  resourceName,
+  apiEndpointFactory: id => `/exercises/${id}/score-config`
+});
+
+export const fetchScoreConfig = actions.fetchResource;
+export const fetchScoreConfigIfNeeded = actions.fetchOneIfNeeded;
+export const setScoreConfig = actions.updateResource;
+
+const reducer = handleActions(reduceActions, initialState);
+export default reducer;
diff --git a/src/redux/modules/exercises.js b/src/redux/modules/exercises.js
index 6fc69ccaa..67cbe8857 100644
--- a/src/redux/modules/exercises.js
+++ b/src/redux/modules/exercises.js
@@ -48,13 +48,18 @@ export const forkStatuses = {
   FULFILLED: 'FULFILLED'
 };
 
-export const forkExercise = (id, forkId) =>
-  createApiAction({
+export const forkExercise = (id, forkId, formData = null) => {
+  let actionData = {
     type: additionalActionTypes.FORK_EXERCISE,
     endpoint: `/exercises/${id}/fork`,
     method: 'POST',
     meta: { id, forkId }
-  });
+  };
+  if (formData && formData.groupId) {
+    actionData.body = { groupId: formData.groupId };
+  }
+  return createApiAction(actionData);
+};
 
 export const create = actions.addResource;
 export const editExercise = actions.updateResource;
diff --git a/src/redux/modules/files.js b/src/redux/modules/files.js
index 2fe362128..06cc1d039 100644
--- a/src/redux/modules/files.js
+++ b/src/redux/modules/files.js
@@ -25,14 +25,14 @@ export const download = downloadHelper({
   fetch: fetchFileIfNeeded,
   actionType: actionTypes.DOWNLOAD,
   fileNameSelector: (id, state) => getJsData(getFile(id)(state)).name,
-  contentType: 'text/plain;charset=utf-8'
+  contentType: 'application/octet-stream'
 });
 export const downloadSupplementaryFile = downloadHelper({
   endpoint: id => `/uploaded-files/supplementary-file/${id}/download`,
   fetch: fetchFileIfNeeded,
   actionType: actionTypes.DOWNLOAD,
   fileNameSelector: (id, state) => getJsData(getFile(id)(state)).name,
-  contentType: 'text/plain;charset=utf-8'
+  contentType: 'application/octet-stream'
 });
 
 /**
diff --git a/src/redux/modules/pipelines.js b/src/redux/modules/pipelines.js
index f5102fc9f..e0e88527b 100644
--- a/src/redux/modules/pipelines.js
+++ b/src/redux/modules/pipelines.js
@@ -37,19 +37,15 @@ export const forkStatuses = {
   FULFILLED: 'FULFILLED'
 };
 
-export const forkPipeline = (id, forkId, exerciseId = null) => {
+export const forkPipeline = (id, forkId, formData = null) => {
   let actionData = {
     type: additionalActionTypes.FORK_PIPELINE,
     endpoint: `/pipelines/${id}/fork`,
     method: 'POST',
     meta: { id, forkId }
   };
-  if (
-    Object.keys(exerciseId).length !== 0 &&
-    exerciseId.constructor === Object &&
-    exerciseId !== null
-  ) {
-    actionData.body = { exerciseId };
+  if (formData && formData.exerciseId) {
+    actionData.body = { exerciseId: formData.exerciseId };
   }
   return createApiAction(actionData);
 };
diff --git a/src/redux/reducer.js b/src/redux/reducer.js
index 8f83dd6c5..e5966d26b 100644
--- a/src/redux/reducer.js
+++ b/src/redux/reducer.js
@@ -11,6 +11,7 @@ import emailVerification from './modules/emailVerification';
 import evaluationProgress from './modules/evaluationProgress';
 import exerciseConfigs from './modules/exerciseConfigs';
 import exerciseEnvironmentConfigs from './modules/exerciseEnvironmentConfigs';
+import exerciseScoreConfig from './modules/exerciseScoreConfig';
 import exercises from './modules/exercises';
 import pipelines from './modules/pipelines';
 import files from './modules/files';
@@ -56,6 +57,7 @@ const createRecodexReducers = token => ({
   evaluationProgress,
   exerciseConfigs,
   exerciseEnvironmentConfigs,
+  exerciseScoreConfig,
   exercises,
   pipelines,
   files,
diff --git a/src/redux/selectors/exerciseScoreConfig.js b/src/redux/selectors/exerciseScoreConfig.js
new file mode 100644
index 000000000..6a3881eaa
--- /dev/null
+++ b/src/redux/selectors/exerciseScoreConfig.js
@@ -0,0 +1,14 @@
+import { createSelector } from 'reselect';
+
+const getExerciseScoreConfig = state => state.exerciseScoreConfig;
+const getResources = exerciseScoreConfig =>
+  exerciseScoreConfig.get('resources');
+
+export const exerciseScoreConfigsSelector = createSelector(
+  getExerciseScoreConfig,
+  getResources
+);
+export const exerciseScoreConfigSelector = exerciseId =>
+  createSelector(exerciseScoreConfigsSelector, configs =>
+    configs.get(exerciseId)
+  );
diff --git a/src/redux/selectors/groups.js b/src/redux/selectors/groups.js
index 369e5007e..3226f8b61 100644
--- a/src/redux/selectors/groups.js
+++ b/src/redux/selectors/groups.js
@@ -12,27 +12,27 @@ import { isReady, getId, getJsData } from '../helpers/resourceManager';
  * Select groups part of the state
  */
 
-export const groupsSelectors = state => state.groups.get('resources');
+export const groupsSelector = state => state.groups.get('resources');
 const filterGroups = (ids, groups) =>
   groups.filter(isReady).filter(group => ids.contains(getId(group)));
 
 export const groupSelector = id =>
-  createSelector(groupsSelectors, groups => groups.get(id));
+  createSelector(groupsSelector, groups => groups.get(id));
 
 export const studentOfSelector = userId =>
   createSelector(
-    [studentOfGroupsIdsSelector(userId), groupsSelectors],
+    [studentOfGroupsIdsSelector(userId), groupsSelector],
     filterGroups
   );
 
 export const supervisorOfSelector = userId =>
   createSelector(
-    [supervisorOfGroupsIdsSelector(userId), groupsSelectors],
+    [supervisorOfGroupsIdsSelector(userId), groupsSelector],
     filterGroups
   );
 
 export const studentOfSelector2 = userId =>
-  createSelector(groupsSelectors, groups =>
+  createSelector(groupsSelector, groups =>
     groups
       .filter(isReady)
       .map(getJsData)
@@ -40,7 +40,7 @@ export const studentOfSelector2 = userId =>
   );
 
 export const supervisorOfSelector2 = userId =>
-  createSelector(groupsSelectors, groups =>
+  createSelector(groupsSelector, groups =>
     groups
       .filter(isReady)
       .map(getJsData)
@@ -48,7 +48,7 @@ export const supervisorOfSelector2 = userId =>
   );
 
 export const adminOfSelector = userId =>
-  createSelector(groupsSelectors, groups =>
+  createSelector(groupsSelector, groups =>
     groups
       .filter(isReady)
       .map(getJsData)
@@ -97,4 +97,4 @@ const getGroupParentIds = (id, groups) => {
 };
 
 export const allParentIdsForGroup = id =>
-  createSelector(groupsSelectors, groups => getGroupParentIds(id, groups));
+  createSelector(groupsSelector, groups => getGroupParentIds(id, groups));
diff --git a/src/redux/store.js b/src/redux/store.js
index 602572154..21a9e5cb8 100644
--- a/src/redux/store.js
+++ b/src/redux/store.js
@@ -7,6 +7,7 @@ import promiseMiddleware from 'redux-promise-middleware';
 import * as storage from 'redux-storage';
 import authMiddleware from './middleware/authMiddleware';
 import apiMiddleware from './middleware/apiMiddleware';
+import loggerMiddleware from './middleware/loggerMiddleware';
 import createReducer from './reducer';
 import createEngine from 'redux-storage-engine-localstorage';
 import filter from 'redux-storage-decorator-filter';
@@ -35,7 +36,10 @@ const getMiddleware = history => [
 const dev = history =>
   compose(
     applyMiddleware(...getMiddleware(history)),
-    canUseDOM && window.devToolsExtension ? window.devToolsExtension() : f => f // use the DEVtools if the extension is installed
+    canUseDOM && window.devToolsExtension ? window.devToolsExtension() : f => f, // use the DEVtools if the extension is installed
+    !canUseDOM || !window.devToolsExtension // dev tools not available, or we are at server -> manual logging
+      ? applyMiddleware(loggerMiddleware)
+      : f => f
   );
 
 const prod = history => compose(applyMiddleware(...getMiddleware(history)));
diff --git a/src/server.js b/src/server.js
index 9a1cf5019..521d6c2af 100644
--- a/src/server.js
+++ b/src/server.js
@@ -59,6 +59,7 @@ const renderWithoutSSR = (res, renderProps) => {
 };
 
 const renderPage = (res, store, renderProps) => {
+  let reduxState = serialize(store.getState(), { isJSON: true });
   let html = renderToString(
     <Provider store={store}>
       <RouterContext {...renderProps} />
@@ -69,7 +70,7 @@ const renderPage = (res, store, renderProps) => {
   res.render('index', {
     html,
     head,
-    reduxState: serialize(store.getState(), { isJSON: true }),
+    reduxState,
     bundle,
     style: '/style.css'
   });
@@ -87,7 +88,7 @@ app.get('*', (req, res) => {
     { history, routes: createRoutes(store.getState), location },
     (error, redirectLocation, renderProps) => {
       if (redirectLocation) {
-        res.redirect(301, redirectLocation.pathname + redirectLocation.search);
+        res.redirect(302, redirectLocation.pathname + redirectLocation.search);
       } else if (error) {
         // @todo use the 500.ejs view
         res.status(500).send(error.message);
@@ -97,20 +98,18 @@ app.get('*', (req, res) => {
       } else {
         const userId = loggedInUserIdSelector(store.getState()); // try to get the user ID from the token (if any)
         const loadAsync = renderProps.components
-          .filter(
-            component =>
-              component &&
-              component.WrappedComponent &&
-              component.WrappedComponent.loadAsync
-          )
+          .filter(component => component)
           .map(component => {
             // there might be several layers of wrapping - connect, withLinks, ...
             while (component.WrappedComponent) {
               component = component.WrappedComponent;
             }
-            return component.loadAsync;
+            return component;
           })
-          .map(load => load(renderProps.params, store.dispatch, userId));
+          .filter(component => component.loadAsync)
+          .map(component =>
+            component.loadAsync(renderProps.params, store.dispatch, userId)
+          );
 
         Promise.all(loadAsync)
           .then(() => renderPage(res, store, renderProps))