diff --git a/frontend/src/pages/Profile.vue b/frontend/src/pages/Profile.vue
index d5bef62..fb493df 100644
--- a/frontend/src/pages/Profile.vue
+++ b/frontend/src/pages/Profile.vue
@@ -28,13 +28,12 @@
             <p class="text-white"> Mein Team: {{teamName}} </p>
           </div>
           <div class="q-pa-md">
-            <div>
-              <q-input v-show="!boolAlreadyInTeam" lazy-rules outlined filled stack-label v-model="newTeamName"
+            <div v-show="!boolAlreadyInTeam">
+              <q-input lazy-rules outlined filled stack-label v-model="newTeamName"
                        type="text"
                        label="Teamname eingeben"
                        :rules="[val=>val.length>=2||'Name muss mindestens 5 Zeichen lang sein!']"/>
               <q-btn
-                v-show="!boolAlreadyInTeam"
                 :disabled="!newTeamNameValidationSuccesful"
                 label="Team anlegen"
                 color="primary"
@@ -43,8 +42,7 @@
                 unelevated
               />
             </div>
-            <br/>
-            <p class="text-h5" v-show="!boolAlreadyInTeam"> Teameinladungen </p>
+            <p class="text-h5 q-mt-sm"> Teameinladungen </p>
             <q-list>
               <q-card class="q-mb-md" v-for="teamInvite in teamInvites" :key="teamInvite.id">
                 <q-expansion-item
@@ -65,13 +63,6 @@
                 </q-expansion-item>
               </q-card>
             </q-list>
-            <div align="center">
-              <q-btn v-show="boolAlreadyInTeam"
-                     label="Team verlassen"
-                     @click="confirmLeave()"
-                     color="negative"
-                     type="submit"/>
-            </div>
           </div>
         </q-tab-panel>
         <q-tab-panel v-if="boolAlreadyInTeam" name="teams" class="q-pa-none">
@@ -119,25 +110,26 @@
               <q-btn label="Nutzer einladen"
                      @click="activateInvite()"
                      color="primary"
+                     class="full-width"
                      type="submit"/>
             </div>
-            <br/>
-            <div align="center">
+            <div align="center" class="row q-mt-sm">
               <q-input v-show="inviteActivated" lazy-rules outlined filled stack-label v-model="inviteMail"
-                       type="text" label="Email des Nutzers"
+                       type="text" label="Email des Nutzers" class="col-9"
                        :rules="[val=>validateEmail(val)||'Bitte Email verwenden']"/>
               <q-btn v-show="inviteActivated"
+                     class="col-3"
                      icon="arrow_right_alt"
                      @click="sendTeamInvite()"
                      :disabled="!teamInviteChecked"
                      color="positive"
                      type="submit"/>
             </div>
-            <br/>
-            <div align="center">
+            <div align="center" class="q-mt-sm">
               <q-btn label="Team verlassen"
                      @click="confirmLeave()"
                      color="negative"
+                     class="full-width"
                      type="submit"/>
             </div>
             <br/>
@@ -499,7 +491,7 @@
             this.updateTeamData();
           }).catch((error) => {
           this.handleError(error);
-        })
+        });
         this.updateStatus();
       },
       handleError(error) {