diff --git a/src/webcomponents/commons/modal/modal-utils.js b/src/webcomponents/commons/modal/modal-utils.js
index 84cb9a6793..b03947a51f 100644
--- a/src/webcomponents/commons/modal/modal-utils.js
+++ b/src/webcomponents/commons/modal/modal-utils.js
@@ -1,6 +1,5 @@
 import {html, nothing} from "lit";
 import LitUtils from "../utils/lit-utils";
-import UtilsNew from "../../../core/utils-new";
 
 
 export default class ModalUtils {
@@ -28,10 +27,8 @@ export default class ModalUtils {
         const modalDraggable = config.display?.modalDraggable || false;
         const modalCyDataName = config.display?.modalCyDataName || "";
 
-        return html `
-            <div class="modal fade" id="${id}" data-draggable="${modalDraggable}"
-                tabindex="-1" role="dialog"
-                aria-labelledby="DataModalLabel" aria-hidden="true" data-cy="${modalCyDataName}">
+        return html`
+            <div id="${id}" class="modal fade" data-draggable="${modalDraggable}" tabindex="-1" role="dialog" aria-labelledby="DataModalLabel" aria-hidden="true" data-cy="${modalCyDataName}">
                 <div class="modal-dialog" style="width: ${modalWidth}">
                     <div class="modal-content">
                         <div class="modal-header">
@@ -49,9 +46,13 @@ export default class ModalUtils {
                         ${btnsVisible? html`
                             <div class="modal-footer">
                                 <button type="button" class="btn btn-primary" data-dismiss="modal"
-                                        @click="${e => LitUtils.dispatchCustomEvent(self, "modalCancel", null, e)}">Cancel</button>
+                                        @click="${e => config.onCancel ? config.onCancel(e) : LitUtils.dispatchCustomEvent(self, "modalCancel", null, e)}">
+                                    Cancel
+                                </button>
                                 <button type="button" class="btn btn-primary" data-dismiss="modal"
-                                        @click="${e => LitUtils.dispatchCustomEvent(self, "modalOk", null, e)}">Save</button>
+                                        @click="${e => config.onOk ? config.onOk(e) : LitUtils.dispatchCustomEvent(self, "modalOk", null, e)}">
+                                    Save
+                                </button>
                             </div>`: nothing}
                     </div>
                 </div>
@@ -124,5 +125,4 @@ export default class ModalUtils {
         modalHeader.style.cursor = "move";
     }
 
-
 }
diff --git a/src/webcomponents/commons/opencb-grid-toolbar.js b/src/webcomponents/commons/opencb-grid-toolbar.js
index 663ac44c00..eaef8b6ccc 100644
--- a/src/webcomponents/commons/opencb-grid-toolbar.js
+++ b/src/webcomponents/commons/opencb-grid-toolbar.js
@@ -149,13 +149,6 @@ export default class OpencbGridToolbar extends LitElement {
                                 </div>
                             `) : nothing}
 
-                            ${this._settings.showRefresh ? html`
-                                <button type="button" class="btn btn-default btn-sm" @click="${() => LitUtils.dispatchCustomEvent(this, "refresh")}">
-                                    <i class="fas fa-sync-alt icon-padding"></i> Refresh
-                                </button>
-                            ` :nothing}
-
-
                             <!-- Second, display elements configured -->
                             ${this._config?.create && (this._settings.showCreate || this._settings.showNew) ? html`
                                 <div class="btn-group">
diff --git a/src/webcomponents/individual/individual-grid.js b/src/webcomponents/individual/individual-grid.js
index 49d0f1b62c..385b2e258e 100644
--- a/src/webcomponents/individual/individual-grid.js
+++ b/src/webcomponents/individual/individual-grid.js
@@ -638,11 +638,81 @@ export default class IndividualGrid extends LitElement {
             });
     }
 
+    onCreateCohortShow() {
+        const filters = {
+            ...this.filters,
+            include: "id,samples.id,samples.internal",
+            limit: 5000,
+        };
+        this.opencgaSession.opencgaClient.individuals()
+            .search(filters)
+            .then(response => {
+                const results = response.getResults();
+                if (results) {
+                    this.createCohortSampleIds = [];
+                    for (const result of results) {
+                        for (const sample of result.samples) {
+                            this.createCohortSampleIds.push({"id": sample.id});
+                        }
+                    }
+                    this.requestUpdate();
+                    ModalUtils.show(`${this._prefix}CreateCohortModal`);
+                } else {
+                    console.error("Error in result format");
+                }
+            })
+            .catch(response => {
+                NotificationUtils.dispatch(this, NotificationUtils.NOTIFY_RESPONSE, response);
+            });
+    }
+
+    onCreateCohortSave() {
+        const cohortId = document.querySelector(`#${this._prefix}CohortId`).value;
+        const cohortName = document.querySelector(`#${this._prefix}CohortName`).value;
+
+        const params = {
+            study: this.opencgaSession.study.fqn,
+            includeResult: false
+        };
+        let error;
+        this.opencgaSession.opencgaClient.cohorts()
+            .create(
+                {
+                    id: cohortId,
+                    name: cohortName ?? "",
+                    samples: this.createCohortSampleIds,
+                }, params)
+            .then(() => {
+                this.createCohortSampleIds = [];
+                NotificationUtils.dispatch(this, NotificationUtils.NOTIFY_SUCCESS, {
+                    title: "Cohort Create",
+                    message: "Cohort created correctly"
+                });
+            })
+            .catch(reason => {
+                error = reason;
+                NotificationUtils.dispatch(this, NotificationUtils.NOTIFY_RESPONSE, reason);
+            });
+    }
+
+    getRightToolbar() {
+        return [
+            {
+                render: () => html`
+                    <button type="button" class="btn btn-default btn-sm" @click="${e => this.onCreateCohortShow(e)}">
+                        <i class="fas fa-users icon-padding"></i> Create Cohort
+                    </button>
+                `,
+            }
+        ];
+    }
+
     render() {
         return html`
             ${this._config.showToolbar ? html`
                 <opencb-grid-toolbar
                     .query="${this.filters}"
+                    .rightToolbar="${this.getRightToolbar()}"
                     .opencgaSession="${this.opencgaSession}"
                     .settings="${this.toolbarSetting}"
                     .config="${this.toolbarConfig}"
@@ -675,6 +745,41 @@ export default class IndividualGrid extends LitElement {
                     `;
                 }
             })}
+
+            ${ModalUtils.create(this, `${this._prefix}CreateCohortModal`, {
+                display: {
+                    modalTitle: "Create Cohort",
+                    modalDraggable: true,
+                    modalbtnsVisible: true
+                },
+                render: () => {
+                    return html`
+                        <div style="margin: 10px">Create a new cohort with <span style="font-weight: bold">${this.createCohortSampleIds?.length} samples</span>.
+                            This can take few seconds depending on the number of samples.</div>
+                        ${this.createCohortSampleIds?.length === 5000 ? html`
+                            <div><span class="alert alert-warning">No more than 5,000 samples allowed</span></div>
+                        ` : nothing}
+                        <div style="margin: 10px">Select the new Cohort ID and Name:</div>
+                        <div>
+                            <form class="form-horizontal">
+                                <div class="form-group">
+                                    <label for="${this._prefix}CohortId" class="col-sm-2 control-label">Cohort ID</label>
+                                    <div class="col-sm-6">
+                                        <input type="text" class="form-control" id="${this._prefix}CohortId" placeholder="">
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label for="${this._prefix}CohortName" class="col-sm-2 control-label">Cohort Name</label>
+                                    <div class="col-sm-6">
+                                        <input type="text" class="form-control" id="${this._prefix}CohortName" placeholder="">
+                                    </div>
+                                </div>
+                            </form>
+                        </div>
+                    `;
+                },
+                onOk: e => this.onCreateCohortSave(e)
+            })}
         `;
     }
 
diff --git a/src/webcomponents/job/job-grid.js b/src/webcomponents/job/job-grid.js
index 8eaec6ee64..9c22ac6080 100644
--- a/src/webcomponents/job/job-grid.js
+++ b/src/webcomponents/job/job-grid.js
@@ -306,10 +306,6 @@ export default class JobGrid extends LitElement {
         this.gridCommons.onColumnChange(e);
     }
 
-    onRefresh() {
-        this.table.bootstrapTable("refresh");
-    }
-
     detailFormatter(value, row) {
         let result = "<div class='row' style='padding-bottom: 20px'>";
         let detailHtml = "";
@@ -369,6 +365,12 @@ export default class JobGrid extends LitElement {
     async onActionClick(e, _, row) {
         const action = e.target.dataset.action?.toLowerCase();
         switch (action) {
+            case "retry":
+                this.jobRetryObj = row;
+                this.requestUpdate();
+                // await this.updateComplete;
+                ModalUtils.show(`${this._prefix}RetryModal`);
+                break;
             case "edit":
                 this.jobUpdateId = row.id;
                 this.requestUpdate();
@@ -436,7 +438,7 @@ export default class JobGrid extends LitElement {
                                     <div style="padding-left: 10px">
                                         ${nestedObject}
                                     </div>` :
-                                    `<span style="margin: 2px 0; font-weight: bold">${key}:</span> ${params[key]}`}
+                                `<span style="margin: 2px 0; font-weight: bold">${key}:</span> ${params[key]}`}
                                 </div>
                             `;
                         }
@@ -533,6 +535,12 @@ export default class JobGrid extends LitElement {
                             <span class="caret" style="margin-left: 5px"></span>
                         </button>
                         <ul class="dropdown-menu dropdown-menu-right">
+                            <li>
+                                <a data-action="retry" href="javascript: void 0" class="btn force-text-left">
+                                    <i class="fas fa-sync icon-padding" aria-hidden="true"></i> Retry ...
+                                </a>
+                            </li>
+                            <li role="separator" class="divider"></li>
                             <li>
                                 <a data-action="copy-json" href="javascript: void 0" class="btn force-text-left">
                                     <i class="fas fa-copy icon-padding" aria-hidden="true"></i> Copy JSON
@@ -607,6 +615,28 @@ export default class JobGrid extends LitElement {
             });
     }
 
+    onJobRetry() {
+        const params = {
+            study: this.opencgaSession.study.fqn
+        };
+        let error;
+        this.opencgaSession.opencgaClient.jobs()
+            .retry(
+                {
+                    job: this.jobRetryObj?.id
+                }, params)
+            .then(() => {
+                NotificationUtils.dispatch(this, NotificationUtils.NOTIFY_SUCCESS, {
+                    title: "Job Retry",
+                    message: "Job executed correctly"
+                });
+            })
+            .catch(reason => {
+                error = reason;
+                NotificationUtils.dispatch(this, NotificationUtils.NOTIFY_RESPONSE, reason);
+            });
+    }
+
     getRightToolbar() {
         return [
             {
@@ -624,13 +654,13 @@ export default class JobGrid extends LitElement {
             ${this._config.showToolbar ? html`
                 <opencb-grid-toolbar
                     .query="${this.filters}"
+                    .rightToolbar="${this.getRightToolbar()}"
                     .opencgaSession="${this.opencgaSession}"
                     .settings="${this.toolbarSetting}"
                     .config="${this.toolbarConfig}"
                     @columnChange="${this.onColumnChange}"
                     @download="${this.onDownload}"
                     @export="${this.onDownload}"
-                    @refresh="${this.onRefresh}"
                     @actionClick="${e => this.onActionClick(e)}"
                     @jobCreate="${this.renderRemoteTable}">
                 </opencb-grid-toolbar>
@@ -640,6 +670,22 @@ export default class JobGrid extends LitElement {
                 <table id="${this.gridId}"></table>
             </div>
 
+            ${ModalUtils.create(this, `${this._prefix}RetryModal`, {
+                display: {
+                    modalTitle: "Job Retry",
+                    modalDraggable: true,
+                    modalbtnsVisible: true
+                },
+                render: () => {
+                    return html`
+                        <div>This will execute a new Job with the same parameters as the original job.
+                            Are you sure do you want to execute again <span style="font-weight: bold">${this.jobRetryObj?.id}</span>?
+                        </div>
+                    `;
+                },
+                onOk: e => this.onJobRetry(e)
+            })}
+
             ${ModalUtils.create(this, `${this._prefix}UpdateModal`, {
                 display: {
                     modalTitle: "Job Update",
diff --git a/src/webcomponents/sample/sample-grid.js b/src/webcomponents/sample/sample-grid.js
index 99aadef9c0..7b45aaeded 100644
--- a/src/webcomponents/sample/sample-grid.js
+++ b/src/webcomponents/sample/sample-grid.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {LitElement, html, nothing} from "lit";
+import {html, LitElement, nothing} from "lit";
 import UtilsNew from "../../core/utils-new.js";
 import GridCommons from "../commons/grid-commons.js";
 import CatalogGridFormatter from "../commons/catalog-grid-formatter.js";
@@ -510,11 +510,78 @@ export default class SampleGrid extends LitElement {
             });
     }
 
+    onCreateCohortShow() {
+        const filters = {
+            ...this.filters,
+            include: "id",
+            limit: 5000,
+        };
+        this.opencgaSession.opencgaClient.samples()
+            .search(filters)
+            .then(response => {
+                const results = response.getResults();
+                if (results) {
+                    this.createCohortSampleIds = results.map(s => {
+                        return {"id": s.id};
+                    });
+                    this.requestUpdate();
+                    ModalUtils.show(`${this._prefix}CreateCohortModal`);
+                } else {
+                    console.error("Error in result format");
+                }
+            })
+            .catch(response => {
+                NotificationUtils.dispatch(this, NotificationUtils.NOTIFY_RESPONSE, response);
+            });
+    }
+
+    onCreateCohortSave() {
+        const cohortId = document.querySelector(`#${this._prefix}CohortId`).value;
+        const cohortName = document.querySelector(`#${this._prefix}CohortName`).value;
+
+        const params = {
+            study: this.opencgaSession.study.fqn,
+            includeResult: false
+        };
+        let error;
+        this.opencgaSession.opencgaClient.cohorts()
+            .create(
+                {
+                    id: cohortId,
+                    name: cohortName ?? "",
+                    samples: this.createCohortSampleIds,
+                }, params)
+            .then(() => {
+                this.createCohortSampleIds = [];
+                NotificationUtils.dispatch(this, NotificationUtils.NOTIFY_SUCCESS, {
+                    title: "Cohort Create",
+                    message: "Cohort created correctly"
+                });
+            })
+            .catch(reason => {
+                error = reason;
+                NotificationUtils.dispatch(this, NotificationUtils.NOTIFY_RESPONSE, reason);
+            });
+    }
+
+    getRightToolbar() {
+        return [
+            {
+                render: () => html`
+                    <button type="button" class="btn btn-default btn-sm" @click="${e => this.onCreateCohortShow(e)}">
+                        <i class="fas fa-users icon-padding"></i> Create Cohort
+                    </button>
+                `,
+            }
+        ];
+    }
+
     render() {
         return html`
             ${this._config.showToolbar ? html`
                 <opencb-grid-toolbar
                     .query="${this.filters}"
+                    .rightToolbar="${this.getRightToolbar()}"
                     .opencgaSession="${this.opencgaSession}"
                     .settings="${this.toolbarSetting}"
                     .config="${this.toolbarConfig}"
@@ -547,6 +614,41 @@ export default class SampleGrid extends LitElement {
                     `;
                 }
             })}
+
+            ${ModalUtils.create(this, `${this._prefix}CreateCohortModal`, {
+                display: {
+                    modalTitle: "Create Cohort",
+                    modalDraggable: true,
+                    modalbtnsVisible: true
+                },
+                render: () => {
+                    return html`
+                        <div style="margin: 10px">Create a new cohort with <span style="font-weight: bold">${this.createCohortSampleIds?.length} samples</span>.
+                            This can take few seconds depending on the number of samples.</div>
+                        ${this.createCohortSampleIds?.length === 5000 ? html`
+                            <div><span class="alert alert-warning">No more than 5,000 samples allowed</span></div>
+                        ` : nothing}
+                        <div style="margin: 10px">Select the new Cohort ID and Name:</div>
+                        <div>
+                            <form class="form-horizontal">
+                                <div class="form-group">
+                                    <label for="${this._prefix}CohortId" class="col-sm-2 control-label">Cohort ID</label>
+                                    <div class="col-sm-6">
+                                        <input type="text" class="form-control" id="${this._prefix}CohortId" placeholder="">
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label for="${this._prefix}CohortName" class="col-sm-2 control-label">Cohort Name</label>
+                                    <div class="col-sm-6">
+                                        <input type="text" class="form-control" id="${this._prefix}CohortName" placeholder="">
+                                    </div>
+                                </div>
+                            </form>
+                        </div>
+                    `;
+                },
+                onOk: e => this.onCreateCohortSave(e)
+            })}
         `;
     }