diff --git a/frontend/src/components/BottomBar.js b/frontend/src/components/BottomBar.js
index af410532..8220411d 100644
--- a/frontend/src/components/BottomBar.js
+++ b/frontend/src/components/BottomBar.js
@@ -90,7 +90,7 @@ class BottomBar extends Component {
         this.setState({openProfile: false});
     };
 
-    handleSubmitInvoiceClicked=(rewardInvoice)=>{
+    handleSubmitInvoiceClicked=(e, rewardInvoice)=>{
         this.setState({
             badInvoice:false,
             showRewardsSpinner: true,
@@ -112,6 +112,7 @@ class BottomBar extends Component {
             withdrawn: data.successful_withdrawal ? true : false,
             showRewardsSpinner: false,
         }));
+        e.preventDefault();
     }
 
     getHost(){
diff --git a/frontend/src/components/Dialogs/ExchangeSummaryDialog.tsx b/frontend/src/components/Dialogs/ExchangeSummary.tsx
similarity index 100%
rename from frontend/src/components/Dialogs/ExchangeSummaryDialog.tsx
rename to frontend/src/components/Dialogs/ExchangeSummary.tsx
diff --git a/frontend/src/components/Dialogs/ProfileDialog.tsx b/frontend/src/components/Dialogs/Profile.tsx
similarity index 95%
rename from frontend/src/components/Dialogs/ProfileDialog.tsx
rename to frontend/src/components/Dialogs/Profile.tsx
index c6f7b678..27815e91 100644
--- a/frontend/src/components/Dialogs/ProfileDialog.tsx
+++ b/frontend/src/components/Dialogs/Profile.tsx
@@ -41,7 +41,7 @@ type Props = {
   activeOrderId: string | number;
   lastOrderId: string | number;
   referralCode: string;
-  handleSubmitInvoiceClicked: (invoice: string) => void;
+  handleSubmitInvoiceClicked: (e:any, invoice: string) => void;
   host: string;
   showRewardsSpinner: boolean;
   withdrawn: boolean;
@@ -273,9 +273,9 @@ const ProfileDialog = ({
                     </Grid>
                   </ListItemText>
                 ) : (
-                  <form style={{maxWidth: 270}}>
-                    <Grid container alignItems="stretch" style={{ display: "flex"}}>
-                      <Grid item style={{ display: "flex" }}>
+                  <form noValidate style={{maxWidth: 270}}>
+                    <Grid container style={{ display: "flex", alignItems: "stretch"}}>
+                      <Grid item style={{ display: "flex", maxWidth:160}} >
                         <TextField
                           error={badInvoice ? true : false}
                           helperText={badInvoice ? badInvoice : "" }
@@ -288,13 +288,14 @@ const ProfileDialog = ({
                         />
                       </Grid>
 
-                      <Grid item alignItems="stretch" style={{ display: "flex" }}>
+                      <Grid item alignItems="stretch" style={{ display: "flex", maxWidth:80}}>
                         <Button
                           sx={{maxHeight:38}}
-                          onClick={() => handleSubmitInvoiceClicked(rewardInvoice)}
+                          onClick={(e) => handleSubmitInvoiceClicked(e, rewardInvoice)}
                           variant="contained"
                           color="primary"
                           size="small"
+                          type="submit"
                         >
                           {t("Submit")}
                         </Button>
diff --git a/frontend/src/components/Dialogs/StatsDialog.tsx b/frontend/src/components/Dialogs/Stats.tsx
similarity index 100%
rename from frontend/src/components/Dialogs/StatsDialog.tsx
rename to frontend/src/components/Dialogs/Stats.tsx
diff --git a/frontend/src/components/Dialogs/index.ts b/frontend/src/components/Dialogs/index.ts
index 4c020d48..b7177726 100644
--- a/frontend/src/components/Dialogs/index.ts
+++ b/frontend/src/components/Dialogs/index.ts
@@ -3,7 +3,7 @@ export { default as InfoDialog } from "./Info";
 export { default as LearnDialog } from "./Learn";
 export { default as NoRobotDialog } from "./NoRobot";
 export { default as StoreTokenDialog } from "./StoreToken";
-export { default as ExchangeSummaryDialog } from "./ExchangeSummaryDialog";
-export { default as ProfileDialog } from "./ProfileDialog";
-export { default as StatsDialog } from "./StatsDialog";
+export { default as ExchangeSummaryDialog } from "./ExchangeSummary";
+export { default as ProfileDialog } from "./Profile";
+export { default as StatsDialog } from "./Stats";