diff --git a/react/common/src/App.css b/react/common/src/App.css
index fea24f8..37c19f0 100644
--- a/react/common/src/App.css
+++ b/react/common/src/App.css
@@ -17,6 +17,11 @@
 @import url("https://console-unipr.elixforms.it/rwe2/isipcss/css/grid_fluid.css");
 
 /* Submit button styling (elixForms main submit) */
+.mainview .container .submit {
+  width: auto;
+  text-align: right;
+}
+
 .mainview .container form input[type="submit"] {
   background-color: #0066cc;
   color: #ffffff;
diff --git a/react/common/src/ElixFormsComponentAbstract.tsx b/react/common/src/ElixFormsComponentAbstract.tsx
index aaa961d..c6a04ab 100644
--- a/react/common/src/ElixFormsComponentAbstract.tsx
+++ b/react/common/src/ElixFormsComponentAbstract.tsx
@@ -196,8 +196,10 @@ export default abstract class ElixFormsComponentAbstract extends Component<IElix
                           {this.createMandatoryFormFields(queryParams)}
                           {this.createAdditionalFormFields()}
                           {this.renderCustomFormFields()}
-                          <br/>
-                          <input type="submit" value={submitDescription ?? 'Submit'} />
+                          <br />
+                          <div className='submit'>
+                            <input type="submit" value={submitDescription ?? 'Submit'} />
+                          </div>
                         </form>
 
                         {this.renderExtraContentPost()}
@@ -263,8 +265,8 @@ export default abstract class ElixFormsComponentAbstract extends Component<IElix
     });
 
     const currentValue = this.state.formData[paramName] !== undefined
-                           ? this.state.formData[paramName]
-                           : (this.checkboxValues.get(paramName)?.join(',').trim() ?? '');
+      ? this.state.formData[paramName]
+      : (this.checkboxValues.get(paramName)?.join(',').trim() ?? '');
 
     return new ElixFormsElement(
       <><FluentUI.Label htmlFor={paramName}>{label}</FluentUI.Label></>,
@@ -397,9 +399,9 @@ export default abstract class ElixFormsComponentAbstract extends Component<IElix
 
   private createDropdownInput(paramName: string, label: string, values: Array<ElixFormsDropdownOption>, required: boolean = false): JSX.Element {
     const queryValue = QueryParamHelper.getOptionFromQuery(paramName);
-    const currentValue = this.state.formData[paramName] !== undefined 
-                           ? this.state.formData[paramName] 
-                           : (queryValue?.toString() ?? '');
+    const currentValue = this.state.formData[paramName] !== undefined
+      ? this.state.formData[paramName]
+      : (queryValue?.toString() ?? '');
 
     const options: FluentUI.IDropdownOption[] = [];