diff --git a/src/components/buttons/ArchiveGroupButton/ArchiveGroupButton.js b/src/components/buttons/ArchiveGroupButton/ArchiveGroupButton.js
index c8ddaa0f1..26ebfa791 100644
--- a/src/components/buttons/ArchiveGroupButton/ArchiveGroupButton.js
+++ b/src/components/buttons/ArchiveGroupButton/ArchiveGroupButton.js
@@ -4,19 +4,12 @@ import { FormattedMessage } from 'react-intl';
 import { ArchiveGroupIcon, LoadingIcon } from '../../icons';
 import Button from '../../widgets/TheButton';
 
-const ArchiveGroupButton = ({
-  archived,
-  pending,
-  disabled = false,
-  setArchived,
-  size = undefined,
-  shortLabels = false,
-}) => (
+const ArchiveGroupButton = ({ archived, pending, disabled = false, setArchived, shortLabels = false, ...props }) => (
   <Button
+    {...props}
     variant={disabled ? 'secondary' : 'info'}
     onClick={setArchived(!archived)}
-    disabled={pending || disabled}
-    size={size}>
+    disabled={pending || disabled}>
     {pending ? <LoadingIcon gapRight /> : <ArchiveGroupIcon archived={archived} gapRight />}
     {archived === true ? (
       shortLabels ? (
@@ -37,7 +30,6 @@ ArchiveGroupButton.propTypes = {
   pending: PropTypes.bool.isRequired,
   disabled: PropTypes.bool,
   setArchived: PropTypes.func.isRequired,
-  size: PropTypes.string,
   shortLabels: PropTypes.bool,
 };
 
diff --git a/src/components/buttons/OrganizationalGroupButton/OrganizationalGroupButton.js b/src/components/buttons/OrganizationalGroupButton/OrganizationalGroupButton.js
index 464ebea6e..c439b0897 100644
--- a/src/components/buttons/OrganizationalGroupButton/OrganizationalGroupButton.js
+++ b/src/components/buttons/OrganizationalGroupButton/OrganizationalGroupButton.js
@@ -4,8 +4,9 @@ import { FormattedMessage } from 'react-intl';
 import { GroupIcon, LoadingIcon } from '../../icons';
 import Button from '../../widgets/TheButton';
 
-const OrganizationalGroupButton = ({ organizational, pending, disabled = false, setOrganizational }) => (
+const OrganizationalGroupButton = ({ organizational, pending, disabled = false, setOrganizational, ...props }) => (
   <Button
+    {...props}
     variant={disabled ? 'secondary' : 'info'}
     onClick={setOrganizational(!organizational)}
     disabled={pending || disabled}>
diff --git a/src/components/forms/RelocateGroupForm/RelocateGroupForm.js b/src/components/forms/RelocateGroupForm/RelocateGroupForm.js
index 10f104822..b2f67c9d7 100644
--- a/src/components/forms/RelocateGroupForm/RelocateGroupForm.js
+++ b/src/components/forms/RelocateGroupForm/RelocateGroupForm.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { injectIntl, FormattedMessage } from 'react-intl';
-import { Form } from 'react-bootstrap';
+import { Row, Col } from 'react-bootstrap';
 import { reduxForm, Field } from 'redux-form';
 import { defaultMemoize } from 'reselect';
 
@@ -36,21 +36,22 @@ const RelocateGroupForm = ({
         <FormattedMessage id="generic.savingFailed" defaultMessage="Saving failed. Please try again later." />
       </Callout>
     )}
-    <Form>
-      <Field
-        name={'groupId'}
-        component={SelectField}
-        label={<FormattedMessage id="app.relocateGroupForm.parentGroup" defaultMessage="Parent Group:" />}
-        options={groups
-          .map(group => ({
-            key: group.id,
-            name: getGroupCanonicalLocalizedName(group, groupsAccessor, locale),
-          }))
-          .sort((a, b) => a.name.localeCompare(b.name, locale))}
-      />
-
-      <div className="text-center">
-        <TheButtonGroup>
+    <Row className="align-items-end">
+      <Col xs={12} sm>
+        <Field
+          name={'groupId'}
+          component={SelectField}
+          label={<FormattedMessage id="app.relocateGroupForm.parentGroup" defaultMessage="Parent Group:" />}
+          options={groups
+            .map(group => ({
+              key: group.id,
+              name: getGroupCanonicalLocalizedName(group, groupsAccessor, locale),
+            }))
+            .sort((a, b) => a.name.localeCompare(b.name, locale))}
+        />
+      </Col>
+      <Col xs={false} sm="auto">
+        <TheButtonGroup className="mb-3">
           {dirty && (
             <Button type="reset" onClick={reset} variant="danger">
               <RefreshIcon gapRight />
@@ -72,8 +73,8 @@ const RelocateGroupForm = ({
             }}
           />
         </TheButtonGroup>
-      </div>
-    </Form>
+      </Col>
+    </Row>
   </div>
 );
 
diff --git a/src/containers/ArchiveGroupButtonContainer/ArchiveGroupButtonContainer.js b/src/containers/ArchiveGroupButtonContainer/ArchiveGroupButtonContainer.js
index 85f5275b8..90bfdedd6 100644
--- a/src/containers/ArchiveGroupButtonContainer/ArchiveGroupButtonContainer.js
+++ b/src/containers/ArchiveGroupButtonContainer/ArchiveGroupButtonContainer.js
@@ -12,18 +12,12 @@ import { identity } from '../../helpers/common';
 
 class ArchiveGroupButtonContainer extends Component {
   render() {
-    const { group, pending, setArchived, size = undefined, ...props } = this.props;
+    const { group, pending, setArchived, ...props } = this.props;
     return (
       <ResourceRenderer resource={group}>
         {({ directlyArchived, permissionHints }) =>
           permissionHints.archive ? (
-            <ArchiveGroupButton
-              archived={directlyArchived}
-              pending={pending}
-              setArchived={setArchived}
-              size={size}
-              {...props}
-            />
+            <ArchiveGroupButton archived={directlyArchived} pending={pending} setArchived={setArchived} {...props} />
           ) : null
         }
       </ResourceRenderer>
diff --git a/src/locales/cs.json b/src/locales/cs.json
index 6d9687efa..1dd90f56a 100644
--- a/src/locales/cs.json
+++ b/src/locales/cs.json
@@ -489,9 +489,11 @@
   "app.editExerciseSimpleConfigTests.useOutfile": "Použít výstupní soubor místo std. výstupu",
   "app.editExerciseSimpleConfigTests.validation.sentryPointString": "Vstupní bod musí být identifikátor.",
   "app.editExerciseTags.noTags": "nejsou přiřazeny žádné nálepky",
+  "app.editGroup.archiveGroup": "Změnit archivační status",
   "app.editGroup.archivedExplain": "Archivované skupiny jsou ohrádky pro studenty, zadané úlohy a jejich řešení u skončených kurzů. Tyto skupiny není možné upravovat a je možné je najít na separátní stránce Archiv.",
   "app.editGroup.cannotDeleteGroupWithSubgroups": "Skupinu s podskupinami není možné smazat přímo.",
   "app.editGroup.cannotDeleteRootGroup": "Toto je primární skupina a jako taková nemůže být smazána.",
+  "app.editGroup.changeGroupType": "Změnit typ skupiny",
   "app.editGroup.deleteGroup": "Smazat skupinu",
   "app.editGroup.deleteGroupWarning": "Smazání skupiny způsobí, že všechny navázané entity (zadané úlohy, odevzdaná řešení, ...) nebudou přístupné.",
   "app.editGroup.organizationalExplain": "Běžné skupiny jsou platformou spojující studenty a zadané úlohy. Organizační skupiny slouží pouze k vytváření hierarchie, takže v nich nesmí být přihlášení studenti a nesmí obsahovat zadané úlohy.",
diff --git a/src/locales/en.json b/src/locales/en.json
index d570c52b8..7022bc6cb 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -489,9 +489,11 @@
   "app.editExerciseSimpleConfigTests.useOutfile": "Use output file instead of stdout",
   "app.editExerciseSimpleConfigTests.validation.sentryPointString": "The entry point value must be an identifier.",
   "app.editExerciseTags.noTags": "no tags assigned",
+  "app.editGroup.archiveGroup": "Change archived status",
   "app.editGroup.archivedExplain": "Archived groups are containers for students, assignments and results after the course is finished. They are immutable and can be accessed through separate Archive page.",
   "app.editGroup.cannotDeleteGroupWithSubgroups": "Group with nested sub-groups cannot be deleted.",
   "app.editGroup.cannotDeleteRootGroup": "This is a so-called root group and it cannot be deleted.",
+  "app.editGroup.changeGroupType": "Change group type",
   "app.editGroup.deleteGroup": "Delete Group",
   "app.editGroup.deleteGroupWarning": "Deleting a group will make all attached entities (assignments, solutions, ...) inaccessible.",
   "app.editGroup.organizationalExplain": "Regular groups are containers for students and assignments. Organizational groups are intended to create hierarchy, so they are forbidden to hold any students or assignments.",
diff --git a/src/pages/EditAssignment/EditAssignment.js b/src/pages/EditAssignment/EditAssignment.js
index 62b736b2d..1d1ca703a 100644
--- a/src/pages/EditAssignment/EditAssignment.js
+++ b/src/pages/EditAssignment/EditAssignment.js
@@ -197,20 +197,22 @@ class EditAssignment extends Component {
                   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">
+                  <Row className="align-items-center">
+                    <Col xs={false} sm="auto">
                       <DeleteAssignmentButtonContainer
                         id={assignmentId}
+                        size="lg"
+                        className="m-2"
                         onDeleted={() => navigate(GROUP_ASSIGNMENTS_URI_FACTORY(assignment.groupId), { replace: true })}
                       />
-                    </p>
-                  </div>
+                    </Col>
+                    <Col xs={12} sm className="text-muted">
+                      <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."
+                      />
+                    </Col>
+                  </Row>
                 </Box>
               )}
             </>
diff --git a/src/pages/EditGroup/EditGroup.js b/src/pages/EditGroup/EditGroup.js
index c88e294f8..1c688c0ec 100644
--- a/src/pages/EditGroup/EditGroup.js
+++ b/src/pages/EditGroup/EditGroup.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { FormattedMessage, injectIntl } from 'react-intl';
-import { Row, Col, Form } from 'react-bootstrap';
+import { Row, Col } from 'react-bootstrap';
 import { connect } from 'react-redux';
 import { reset, formValueSelector } from 'redux-form';
 import { defaultMemoize } from 'reselect';
@@ -18,7 +18,7 @@ import DeleteGroupButtonContainer from '../../containers/DeleteGroupButtonContai
 import Box from '../../components/widgets/Box';
 import Callout from '../../components/widgets/Callout';
 import GroupArchivedWarning from '../../components/Groups/GroupArchivedWarning/GroupArchivedWarning';
-import { BanIcon, InfoIcon, EditGroupIcon } from '../../components/icons';
+import { BanIcon, EditGroupIcon, WarningIcon } from '../../components/icons';
 
 import { fetchGroup, fetchGroupIfNeeded, editGroup, relocateGroup } from '../../redux/modules/groups';
 import {
@@ -108,47 +108,6 @@ class EditGroup extends Component {
 
             <GroupArchivedWarning {...group} groupsDataAccessor={groupsAccessor} linkFactory={GROUP_EDIT_URI_FACTORY} />
 
-            {hasPermissions(group, 'update') && (
-              <>
-                {!group.archived && (
-                  <Row>
-                    <Col lg={3}>
-                      <p>
-                        <OrganizationalGroupButtonContainer id={group.id} locale={locale} />
-                      </p>
-                    </Col>
-                    <Col lg={9}>
-                      <p className="small text-muted" style={{ padding: '0.75em' }}>
-                        <InfoIcon gapRight />
-                        <FormattedMessage
-                          id="app.editGroup.organizationalExplain"
-                          defaultMessage="Regular groups are containers for students and assignments. Organizational groups are intended to create hierarchy, so they are forbidden to hold any students or assignments."
-                        />
-                      </p>
-                    </Col>
-                  </Row>
-                )}
-                {hasPermissions(group, 'archive') && (!group.archived || group.directlyArchived) && (
-                  <Row>
-                    <Col lg={3}>
-                      <p>
-                        <ArchiveGroupButtonContainer id={group.id} onChange={reload} />
-                      </p>
-                    </Col>
-                    <Col lg={9}>
-                      <p className="small text-muted" style={{ padding: '0.75em' }}>
-                        <InfoIcon gapRight />
-                        <FormattedMessage
-                          id="app.editGroup.archivedExplain"
-                          defaultMessage="Archived groups are containers for students, assignments and results after the course is finished. They are immutable and can be accessed through separate Archive page."
-                        />
-                      </p>
-                    </Col>
-                  </Row>
-                )}
-              </>
-            )}
-
             {hasPermissions(group, 'update') && !group.archived && (
               <EditGroupForm
                 form="editGroup"
@@ -179,20 +138,58 @@ class EditGroup extends Component {
               </ResourceRenderer>
             )}
 
+            {hasPermissions(group, 'update') && (
+              <>
+                {!group.archived && (
+                  <Box
+                    type="info"
+                    title={<FormattedMessage id="app.editGroup.changeGroupType" defaultMessage="Change group type" />}>
+                    <Row className="align-items-center">
+                      <Col xs={false} sm="auto">
+                        <OrganizationalGroupButtonContainer id={group.id} size="lg" className="m-2" locale={locale} />
+                      </Col>
+                      <Col xs={12} sm className="text-muted">
+                        <FormattedMessage
+                          id="app.editGroup.organizationalExplain"
+                          defaultMessage="Regular groups are containers for students and assignments. Organizational groups are intended to create hierarchy, so they are forbidden to hold any students or assignments."
+                        />
+                      </Col>
+                    </Row>
+                  </Box>
+                )}
+
+                {hasPermissions(group, 'archive') && (!group.archived || group.directlyArchived) && (
+                  <Box
+                    type="info"
+                    title={
+                      <FormattedMessage id="app.editGroup.archiveGroup" defaultMessage="Change archived status" />
+                    }>
+                    <Row className="align-items-center">
+                      <Col xs={false} sm="auto">
+                        <ArchiveGroupButtonContainer id={group.id} size="lg" className="m-2" onChange={reload} />
+                      </Col>
+                      <Col xs={12} sm className="text-muted">
+                        <FormattedMessage
+                          id="app.editGroup.archivedExplain"
+                          defaultMessage="Archived groups are containers for students, assignments and results after the course is finished. They are immutable and can be accessed through separate Archive page."
+                        />
+                      </Col>
+                    </Row>
+                  </Box>
+                )}
+              </>
+            )}
+
             {hasPermissions(group, 'remove') && (
               <Box
                 type="danger"
                 title={<FormattedMessage id="app.editGroup.deleteGroup" defaultMessage="Delete Group" />}>
-                <div>
-                  <p>
-                    <FormattedMessage
-                      id="app.editGroup.deleteGroupWarning"
-                      defaultMessage="Deleting a group will make all attached entities (assignments, solutions, ...) inaccessible."
-                    />
-                  </p>
-                  <p className="text-center">
+                <Row className="align-items-center">
+                  <Col xs={false} sm="auto">
                     <DeleteGroupButtonContainer
                       id={group.id}
+                      size="lg"
+                      className="m-2"
                       disabled={
                         group.parentGroupId === null || (group.childGroups && group.childGroups.length > 0) // TODO whatabout archived sub-groups?
                       }
@@ -205,26 +202,36 @@ class EditGroup extends Component {
                         )
                       }
                     />
+                  </Col>
+                  <Col xs={12} sm>
+                    <div className="text-muted">
+                      <FormattedMessage
+                        id="app.editGroup.deleteGroupWarning"
+                        defaultMessage="Deleting a group will make all attached entities (assignments, solutions, ...) inaccessible."
+                      />
+                    </div>
 
                     {group.parentGroupId === null && (
-                      <Form.Text>
+                      <div className="mt-1">
+                        <WarningIcon className="text-danger" gapRight />
                         <FormattedMessage
                           id="app.editGroup.cannotDeleteRootGroup"
                           defaultMessage="This is a so-called root group and it cannot be deleted."
                         />
-                      </Form.Text>
+                      </div>
                     )}
 
                     {group.parentGroupId !== null && group.childGroups && group.childGroups.length > 0 && (
-                      <Form.Text>
+                      <div className="mt-1">
+                        <WarningIcon className="text-danger" gapRight />
                         <FormattedMessage
                           id="app.editGroup.cannotDeleteGroupWithSubgroups"
                           defaultMessage="Group with nested sub-groups cannot be deleted."
                         />
-                      </Form.Text>
+                      </div>
                     )}
-                  </p>
-                </div>
+                  </Col>
+                </Row>
               </Box>
             )}
           </div>
diff --git a/src/pages/EditPipeline/EditPipeline.js b/src/pages/EditPipeline/EditPipeline.js
index 134226449..0bb3ea8ca 100644
--- a/src/pages/EditPipeline/EditPipeline.js
+++ b/src/pages/EditPipeline/EditPipeline.js
@@ -167,20 +167,22 @@ class EditPipeline extends Component {
                 <Box
                   type="danger"
                   title={<FormattedMessage id="app.editPipeline.delete" defaultMessage="Delete the pipeline" />}>
-                  <div>
-                    <p>
-                      <FormattedMessage
-                        id="app.editPipeline.deleteWarning"
-                        defaultMessage="Deleting an pipeline will break all exercises using the pipeline."
-                      />
-                    </p>
-                    <p className="text-center">
+                  <Row className="align-items-center">
+                    <Col xs={false} sm="auto">
                       <DeletePipelineButtonContainer
                         id={pipeline.id}
+                        size="lg"
+                        className="m-2"
                         onDeleted={() => navigate(PIPELINES_URI, { replace: true })}
                       />
-                    </p>
-                  </div>
+                    </Col>
+                    <Col xs={12} sm className="text-muted">
+                      <FormattedMessage
+                        id="app.editPipeline.deleteWarning"
+                        defaultMessage="Deleting an pipeline will break all exercises using the pipeline."
+                      />
+                    </Col>
+                  </Row>
                 </Box>
               </Col>
             </Row>
diff --git a/src/pages/EditShadowAssignment/EditShadowAssignment.js b/src/pages/EditShadowAssignment/EditShadowAssignment.js
index 8bb12fb58..bae71a537 100644
--- a/src/pages/EditShadowAssignment/EditShadowAssignment.js
+++ b/src/pages/EditShadowAssignment/EditShadowAssignment.js
@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { FormattedMessage } from 'react-intl';
+import { Row, Col } from 'react-bootstrap';
 import { connect } from 'react-redux';
 import { reset, formValueSelector, SubmissionError } from 'redux-form';
 import { defaultMemoize } from 'reselect';
@@ -131,20 +132,22 @@ class EditShadowAssignment extends Component {
                       defaultMessage="Delete the shadow assignment"
                     />
                   }>
-                  <div>
-                    <p>
-                      <FormattedMessage
-                        id="app.editShadowAssignment.deleteAssignmentWarning"
-                        defaultMessage="Deleting shadow assignment will remove all student points as well."
-                      />
-                    </p>
-                    <p className="text-center">
+                  <Row className="align-items-center">
+                    <Col xs={false} sm="auto">
                       <DeleteShadowAssignmentButtonContainer
                         id={shadowId}
+                        size="lg"
+                        className="m-2"
                         onDeleted={() => navigate(GROUP_ASSIGNMENTS_URI_FACTORY(this.groupId), { replace: true })}
                       />
-                    </p>
-                  </div>
+                    </Col>
+                    <Col xs={12} sm className="text-muted">
+                      <FormattedMessage
+                        id="app.editShadowAssignment.deleteAssignmentWarning"
+                        defaultMessage="Deleting shadow assignment will remove all student points as well."
+                      />
+                    </Col>
+                  </Row>
                 </Box>
               )}
             </>