diff --git a/src/components/FormField/components/Checkboxes/index.js b/src/components/FormField/components/Checkboxes/index.js
index 80c9b96..2e08031 100644
--- a/src/components/FormField/components/Checkboxes/index.js
+++ b/src/components/FormField/components/Checkboxes/index.js
@@ -58,7 +58,7 @@ const Checkboxes = ({
                     name={fieldName}
                     value={o.name}
                     onChange={(e) => onCheckboxesChange(e, field.onChange)}
-                    checked={field.value.includes(o.name)}
+                    checked={field.value && field.value.includes ? field.value.includes(o.name) : false}
                     className={classNames({ 'p-invalid': fieldState.invalid })}/>
                 <label htmlFor={`${fieldName}_${o.name}`}>{o.label}</label>
             </div>)}/>
diff --git a/src/pages/BandoApplication/index.js b/src/pages/BandoApplication/index.js
index f433ed8..b9bb11e 100644
--- a/src/pages/BandoApplication/index.js
+++ b/src/pages/BandoApplication/index.js
@@ -324,6 +324,41 @@ const BandoApplication = () => {
             {!isAsyncRequest
                 ? <div className="appPage__content">
                     <form className="appForm" onSubmit={handleSubmit(onSubmit)}>
+                        <div className="appPageSection">
+                            <div className="appPageSection__actions">
+                                {activeStep > 1 && activeStep <= totalSteps
+                                    ? <Button
+                                        type="button"
+                                        disabled={'SUBMIT' === applicationStatus}
+                                        onClick={goBackward}
+                                        label={__('Vai indietro', 'gepafin')}
+                                        icon="pi pi-arrow-left"
+                                        iconPos="left"/> : null}
+                                <Button
+                                    type="button"
+                                    disabled={isAsyncRequest || 'SUBMIT' === applicationStatus}
+                                    onClick={saveDraft}
+                                    outlined
+                                    label={__('Salva bozza', 'gepafin')} icon="pi pi-save" iconPos="right"/>
+                                {activeStep < totalSteps
+                                    //&& activeStep === completedSteps
+                                    ? <Button
+                                        type="button"
+                                        disabled={'SUBMIT' === applicationStatus}
+                                        onClick={goForward}
+                                        label={__('Vai avanti', 'gepafin')}
+                                        icon="pi pi-arrow-right"
+                                        iconPos="right"/> : null}
+                                <Button
+                                    disabled={completedSteps === 0 || completedSteps !== totalSteps || 'SUBMIT' === applicationStatus}
+                                    label={__('Invia', 'gepafin')}
+                                    icon="pi pi-check"
+                                    iconPos="right"/>
+                            </div>
+                        </div>
+
+
+
                         {formInitialData
                             ? formData.map(o => {
                                 const label = head(o.settings.filter(o => o.name === 'label'));