diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index 50049f5cb..bf32a0ae7 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -61,8 +61,10 @@ action.user-role=User Role
 action.toggle-view=Toggle view
 action.advanced=Advanced
 action.add-new-attribute=Add new attribute
+action.add-new-group=Add new group
 action.add-attribute=Add Attribute
 action.custom-entity-attributes=Custom Entity Attributes
+action.groups=Groups
 
 value.enabled=Enabled
 value.disabled=Disabled
@@ -145,6 +147,9 @@ label.entity-attributes=Entity Attributes
 label.custom-entity-attributes=Custom Entity Attributes
 label.help-text=Help text
 label.default-value=Default Value
+label.groups-management=Groups Management
+label.new-group=New Group
+label.new-attribute=New Custom Entity Attribute
 
 label.metadata-source=Metadata Source
 label.metadata-sources=Metadata Sources
@@ -168,6 +173,8 @@ label.new-endpoint=New Endpoint
 label.select-binding=Select Binding Type
 label.mark-as-default=Mark as Default
 label.attribute-name=Attribute Name
+label.group-name=Group Name
+label.group-description=Group Description
 label.yes=Yes
 label.check-all-attributes=Check All Attributes
 label.clear-all-attributes=Clear All Attributes
@@ -644,4 +651,7 @@ tooltip.match=A regular expression against which the entityID is evaluated.
 tooltip.remove-existing-formats=Whether to remove any existing formats from a role if any are added by the filter (unmodified roles will be untouched regardless of this setting)
 tooltip.nameid-formats-format=Format
 tooltip.nameid-formats-value=Value
-tooltip.nameid-formats-type=Type
\ No newline at end of file
+tooltip.nameid-formats-type=Type
+
+tooltip.group-name=Group Name
+tooltip.group-description=Group Description
\ No newline at end of file
diff --git a/ui/public/assets/schema/groups/group.json b/ui/public/assets/schema/groups/group.json
index 088d861f6..02bcb2dea 100644
--- a/ui/public/assets/schema/groups/group.json
+++ b/ui/public/assets/schema/groups/group.json
@@ -10,6 +10,13 @@
             "type": "string",
             "minLength": 1,
             "maxLength": 255
+        },
+        "description": {
+            "title": "label.group-description",
+            "description": "tooltip.group-description",
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 255
         }
     }
 }
\ No newline at end of file
diff --git a/ui/src/app/admin/component/GroupForm.js b/ui/src/app/admin/component/GroupForm.js
index 2f738c321..37e3b73dc 100644
--- a/ui/src/app/admin/component/GroupForm.js
+++ b/ui/src/app/admin/component/GroupForm.js
@@ -44,7 +44,7 @@ export function GroupForm ({group = {}, errors = [], loading = false, schema, on
             </div>
             <hr />
             <div className="row">
-                <div className="col-12 col-lg-12 order-2">
+                <div className="col-12 col-lg-6 order-2">
                     <Form formData={group}
                         noHtml5Validate={true}
                         onChange={(form) => onChange(form)}
diff --git a/ui/src/app/admin/container/EditGroup.js b/ui/src/app/admin/container/EditGroup.js
index eedc86e6d..40e2a61e1 100644
--- a/ui/src/app/admin/container/EditGroup.js
+++ b/ui/src/app/admin/container/EditGroup.js
@@ -16,12 +16,12 @@ export function EditGroup() {
 
     const history = useHistory();
 
-    const { post, response, loading } = useGroups({});
+    const { put, response, loading } = useGroups();
 
     const [blocking, setBlocking] = React.useState(false);
 
     async function save(metadata) {
-        await post(``, metadata);
+        await put(``, metadata);
         if (response.ok) {
             gotoDetail({ refresh: true });
         }
@@ -48,7 +48,7 @@ export function EditGroup() {
                 <div className="section-header bg-info p-2 text-white">
                     <div className="row justify-content-between">
                         <div className="col-md-12">
-                            <span className="display-6"><Translate value="label.new-group">Add a new group</Translate></span>
+                            <span className="display-6"><Translate value="label.edit-group">Edit group</Translate></span>
                         </div>
                     </div>
                 </div>
diff --git a/ui/src/app/admin/container/GroupsList.js b/ui/src/app/admin/container/GroupsList.js
index b94a3019f..f0a1146e3 100644
--- a/ui/src/app/admin/container/GroupsList.js
+++ b/ui/src/app/admin/container/GroupsList.js
@@ -6,14 +6,11 @@ import Button from 'react-bootstrap/Button';
 import { Link } from 'react-router-dom';
 
 import { Translate } from '../../i18n/components/translate';
-import { useTranslator } from '../../i18n/hooks';
 
 import { DeleteConfirmation } from '../../core/components/DeleteConfirmation';
 
 export function GroupsList({ groups, onDelete }) {
 
-    const translator = useTranslator();
-
     const remove = (id) => {
         onDelete(id);
     }
@@ -51,13 +48,13 @@ export function GroupsList({ groups, onDelete }) {
                                                 <tr key={i}>
                                                     <td>{group.name}</td>
                                                     <td className="text-right">
-                                                        <Link to={`../groups/${group.name}/edit`} className="btn btn-link text-primary">
+                                                        <Link to={`../groups/${group.resourceId}/edit`} className="btn btn-link text-primary">
                                                             <FontAwesomeIcon icon={faEdit} size="lg" />
                                                             <span className="sr-only">
                                                                 <Translate value="action.edit">Edit</Translate>
                                                             </span>
                                                         </Link>
-                                                        <Button variant="link" className="text-danger" onClick={() => block(() => remove(group.name))}>
+                                                        <Button variant="link" className="text-danger" onClick={() => block(() => remove(group.resourceId))}>
                                                             <FontAwesomeIcon icon={faTrash} size="lg" />
                                                             <span className="sr-only">
                                                                 <Translate value="action.delete">Delete</Translate>
diff --git a/ui/src/app/admin/hoc/GroupProvider.js b/ui/src/app/admin/hoc/GroupProvider.js
index 83674e51e..5cc2adffb 100644
--- a/ui/src/app/admin/hoc/GroupProvider.js
+++ b/ui/src/app/admin/hoc/GroupProvider.js
@@ -4,11 +4,7 @@ import { useGroup } from '../hooks';
 export function GroupProvider({ id, children }) {
 
     const [group, setGroup] = React.useState();
-
-
-    const { get, response } = useGroup({
-        cachePolicy: 'no-cache'
-    });
+    const { get, response } = useGroup(id);
 
     async function loadGroup() {
         const group = await get(``);
diff --git a/ui/src/app/admin/hoc/GroupsProvider.js b/ui/src/app/admin/hoc/GroupsProvider.js
index a9d47131b..c7243e1fa 100644
--- a/ui/src/app/admin/hoc/GroupsProvider.js
+++ b/ui/src/app/admin/hoc/GroupsProvider.js
@@ -3,11 +3,7 @@ import { useGroups } from '../hooks';
 
 export function GroupsProvider({ children }) {
 
-    const [groups, setGroups] = React.useState([
-        {
-            name: 'foo'
-        }
-    ]);
+    const [groups, setGroups] = React.useState([]);
 
 
     const { get, del, response } = useGroups({
@@ -29,7 +25,7 @@ export function GroupsProvider({ children }) {
     }
 
     /*eslint-disable react-hooks/exhaustive-deps*/
-    // React.useEffect(() => { loadGroups() }, []);
+    React.useEffect(() => { loadGroups() }, []);
 
     return (<>{children(groups, removeGroup)}</>);
 }
\ No newline at end of file
diff --git a/ui/src/app/admin/hooks.js b/ui/src/app/admin/hooks.js
index 96a391944..2d2b70610 100644
--- a/ui/src/app/admin/hooks.js
+++ b/ui/src/app/admin/hooks.js
@@ -2,19 +2,21 @@ import useFetch from 'use-http';
 import API_BASE_PATH from '../App.constant';
 
 export function useGroups () {
-    return useFetch(`${API_BASE_PATH}/groups`);
+    return useFetch(`${API_BASE_PATH}/admin/groups`, {
+        cachePolicy: 'no-cache'
+    });
 }
 
-export function useGroup() {
-    return useFetch(`/group.json`);
+export function useGroup(id) {
+    return useFetch(`${API_BASE_PATH}/admin/groups/${id}`, {
+        cachePolicy: 'no-cache'
+    });
 }
 
-/*export function useGroup() {
-    return useFetch(`${API_BASE_PATH}/group`);
-}*/
-
 export function useGroupUiSchema () {
     return {
-
+        description: {
+            'ui:widget': 'textarea'
+        }
     };
 }
\ No newline at end of file