diff --git a/pages/HTML/profile.html b/pages/HTML/profile.html
index 5b96473..f3d656e 100644
--- a/pages/HTML/profile.html
+++ b/pages/HTML/profile.html
@@ -1,59 +1,107 @@
+<center>%%INFOMESSAGE%%</center>
 
-
-<div style="width: 400px; margin: auto; left: 50%;">
-    <form action="index.php?page=profile" method="post">
-        <div class="row">
-            <div class="col">
-                <label for="inputVorname">Vorname</label>
-                <input type="text" class="form-control" id="inputVorname" name="formInputFeldVorname" placeholder="%%firstname%%">
+<div class="container-fluid">
+	<div class="row">
+		<div class="col-md-6">
+            <div style="width: 400px; margin: auto; left: 50%;">
+                <form action="index.php?page=profile" method="post">
+                    <div class="row">
+                        <div class="col">
+                            <label for="inputVorname">Vorname</label>
+                            <input type="text" class="form-control" id="inputVorname" name="formInputFeldVorname" placeholder="%%firstname%%">
+                        </div>
+                        <div class="col">
+                            <label for="inputNachname">Nachname</label>
+                            <input type="text" class="form-control" id="inputNachname" name="formInputFeldNachname" placeholder="%%lastname%%">
+                        </div>
+                    </div>
+            
+                    <div class="row" style="margin-top: 15px;">
+                        <div class="col">
+                            <label for="inputVorname">E-Mail</label>
+                            <input type="text" class="form-control" id="inputEmail" name="formInputFeldEMail" placeholder="%%email%%">
+                        </div>
+                    </div>
+                    <div class="form-group" style="margin-top: 15px;">
+                        <div class="form-check">
+                            <input class="form-check-input" name="formInputFeldOfflineIM" type="checkbox" id="gridCheck"%%offlineIMSTATE%%>
+                            <label class="form-check-label" for="gridCheck"> Offline IM</label>
+                        </div>
+                    </div>
+            
+                    <div class="row" style="margin-top: 15px;">
+                        <div class="col">
+                            <hr>
+                        </div>
+                    </div>
+            
+                    <div class="row" style="margin-top: 15px;">
+                        <div class="col">
+                            <label for="dropdownPartner">Partner</label>
+                            <input type="text" class="form-control" name="formInputFeldPartnerName" id="inputpartner" placeholder="%%partner%%">
+                        </div>
+                    </div>
+            
+                    <div class="row" style="margin-top: 15px;">
+                        <div class="col">
+                            <hr>
+                        </div>
+                    </div>
+            
+                    <div class="row" style="margin-top: 15px;">
+                        <div class="col">
+                            <button type="submit" name="saveProfileData" class="btn btn-primary btn-lg">Speichern</button>
+                        </div>
+                    </div>
+                    
+                </form>
             </div>
-            <div class="col">
-                <label for="inputNachname">Nachname</label>
-                <input type="text" class="form-control" id="inputNachname" name="formInputFeldNachname" placeholder="%%lastname%%">
+		</div>
+		<div class="col-md-6">
+            <div style="width: 400px; margin: auto; left: 50%;">
+                <form action="index.php?page=password" method="post">
+                    <div class="row">
+                        <div class="col">
+                            <label for="oldPassword">Altes Passwort</label>
+                            <input type="text" class="form-control" id="oldPassword" name="oldPassword"">
+                        </div>
+                    </div>
+            
+                    <div class="row" style="margin-top: 15px;">
+                        <div class="col">
+                            <label for="newPassword">Neues Passwort</label>
+                            <input type="text" class="form-control" id="PasswordNew" name="newPassword"">
+                        </div>
+                    </div>
+            
+                    
+                    <div class="row" style="margin-top: 15px;">
+                        <div class="col">
+                            <label for="newPasswordRepeate">Neues Passwort wiederholen</label>
+                            <input type="text" class="form-control" id="PasswordNewRepeate" name="newPasswordRepeate"">
+                        </div>
+                    </div>
+            
+            
+                    <div class="row" style="margin-top: 15px;">
+                        <div class="col">
+                            <hr>
+                        </div>
+                    </div>
+            
+                    <div class="row" style="margin-top: 15px;">
+                        <div class="col">
+                            <button type="submit" name="savePassword" class="btn btn-primary btn-lg">Speichern</button>
+                        </div>
+                    </div>
+                    
+                </form>
             </div>
-        </div>
-
-        <div class="row" style="margin-top: 15px;">
-            <div class="col">
-                <label for="inputVorname">E-Mail</label>
-                <input type="text" class="form-control" id="inputEmail" name="formInputFeldEMail" placeholder="%%email%%">
-            </div>
-        </div>
-        <div class="form-group" style="margin-top: 15px;">
-            <div class="form-check">
-                <input class="form-check-input" name="formInputFeldOfflineIM" type="checkbox" id="gridCheck"%%offlineIMSTATE%%>
-                <label class="form-check-label" for="gridCheck"> Offline IM</label>
-            </div>
-        </div>
-
-        <div class="row" style="margin-top: 15px;">
-            <div class="col">
-                <hr>
-            </div>
-        </div>
-
-        <div class="row" style="margin-top: 15px;">
-            <div class="col">
-                <label for="dropdownPartner">Partner</label>
-                <input type="text" class="form-control" name="formInputFeldPartnerName" id="inputpartner" placeholder="%%partner%%">
-            </div>
-        </div>
-
-        <div class="row" style="margin-top: 15px;">
-            <div class="col">
-                <hr>
-            </div>
-        </div>
-
-        <div class="row" style="margin-top: 15px;">
-            <div class="col">
-                <button type="submit" name="saveProfileData" class="btn btn-primary btn-lg">Speichern</button>
-            </div>
-        </div>
-        
-    </form>
+		</div>
+	</div>
 </div>
 
+
 <script>
     var countries = [%%listAllResidentsAsJSArray%%];
 
diff --git a/pages/HTML/users.html b/pages/HTML/users.html
new file mode 100644
index 0000000..4e1b5f4
--- /dev/null
+++ b/pages/HTML/users.html
@@ -0,0 +1,32 @@
+<div class="container-fluid">
+	<div class="row">
+        <div class="col-md-6">
+            %%REGION-LIST%%
+        </div>
+		<div class="col-md-6">
+            <div style="width: 400px; margin: auto; left: 50%;">
+                Hier kannst du einen Invite Link erstellen.<br>
+                Jeder der solch einen Link bekommt, kann sich im Grid Regestrieren.
+                Der Link ist einzigartig und funktioniert nur einmalig.<br>
+                Nach dem aufrufen des Links muss ein Name, Passwort und Standart Avatar ausgewählt werden.
+            </div>
+            
+            <div style="width: 400px; margin: auto; left: 50%;">
+                <form action="index.php?page=invite" method="post">
+                    <div class="row" style="margin-top: 15px;">
+                        <div class="col">
+                            <label for="linkOutput">InviteLink:</label>
+                            <input type="text" class="form-control" id="linkOutput" name="formLink" value="%%link%%">
+                        </div>
+                    </div>
+            
+                    <div class="row" style="margin-top: 15px;">
+                        <div class="col">
+                            <button type="submit" name="generateLink" class="btn btn-primary btn-lg">Link Generieren</button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/pages/password.php b/pages/password.php
index d647156..73003b0 100644
--- a/pages/password.php
+++ b/pages/password.php
@@ -1,7 +1,7 @@
 <?php
 
     $HTML->setHTMLTitle("Passwort ändern");
-    $HTML->importSeitenInhalt("pages/HTML/passwort.html");
+    $HTML->importSeitenInhalt("pages/HTML/profile.html");
 
     if(isset($_REQUEST['oldPassword']) || @$_REQUEST['oldPassword'] != "")
     {
diff --git a/pages/profile.php b/pages/profile.php
index 6b208a7..12cf2a8 100644
--- a/pages/profile.php
+++ b/pages/profile.php
@@ -129,7 +129,9 @@
     $HTML->ReplaceSeitenInhalt("%%partner%%", $PartnerName); 
     $HTML->ReplaceSeitenInhalt("%%email%%", $RUNTIME['OPENSIM']->getUserMail($_SESSION['UUID'])); 
     $HTML->ReplaceSeitenInhalt("%%listAllResidentsAsJSArray%%", $allUsers); 
-    
+    $HTML->ReplaceSeitenInhalt("%%INFOMESSAGE%%", ' ');
+    $HTML->ReplaceSeitenInhalt("%%INFOMESSAGE%%", ' '); 
+
     $HTML->build();
     echo $HTML->ausgabe();
 ?>
\ No newline at end of file
diff --git a/pages/users.php b/pages/users.php
index 512defd..1bc9bc3 100644
--- a/pages/users.php
+++ b/pages/users.php
@@ -6,25 +6,25 @@
         $HTML->build();
         echo $HTML->ausgabe();
         die();
-    }else{
-        $HTML->setHTMLTitle("Benutzer");
-        $HTML->importSeitenInhalt("pages/HTML/deine-regionen.html");
-    
-        $table = '<table class="table"><thead><tr><th scope="col">Vorname</th><th scope="col">Nachname</th><th scope="col">Status</th><th scope="col">Aktionen</th></thead><tbody>%%ENTRY%%</tbody></table>';
-        
-        $statement = $RUNTIME['PDO']->prepare("SELECT * FROM UserAccounts ORDER BY Created ASC");
-        $statement->execute(); 
-    
-        while($row = $statement->fetch()) 
-        {
-            $entry = '<tr><td>'.$row['FirstName'].'</td><td>'.$row['LastName'].'</td><td>'.$row['UserLevel'].'</td><td>PASSWORT ÄNDERN | SPERREN | UMBENENNEN</td></tr>';
-            $table = str_replace("%%ENTRY%%", $entry."%%ENTRY%%", $table);
-        }
-    
-        $table = str_replace("%%ENTRY%%", "", $table);
-        $HTML->ReplaceSeitenInhalt("%%REGION-LIST%%", $table);
-    
-        $HTML->build();
-        echo $HTML->ausgabe();
     }
+
+    $HTML->setHTMLTitle("Benutzer");
+    $HTML->importSeitenInhalt("pages/HTML/users.html");
+
+    $table = '<table class="table"><thead><tr><th scope="col">Vorname</th><th scope="col">Nachname</th><th scope="col">Status</th><th scope="col">Aktionen</th></thead><tbody>%%ENTRY%%</tbody></table>';
+    
+    $statement = $RUNTIME['PDO']->prepare("SELECT * FROM UserAccounts ORDER BY Created ASC");
+    $statement->execute(); 
+
+    while($row = $statement->fetch()) 
+    {
+        $entry = '<tr><td>'.$row['FirstName'].'</td><td>'.$row['LastName'].'</td><td>'.$row['UserLevel'].'</td><td>PASSWORT ÄNDERN | SPERREN</td></tr>';
+        $table = str_replace("%%ENTRY%%", $entry."%%ENTRY%%", $table);
+    }
+
+    $table = str_replace("%%ENTRY%%", "", $table);
+    $HTML->ReplaceSeitenInhalt("%%REGION-LIST%%", $table);
+
+    $HTML->build();
+    echo $HTML->ausgabe();
 ?>
\ No newline at end of file
diff --git a/style/default/dashboard-admin.html b/style/default/dashboard-admin.html
index 879f8eb..c0c0d29 100644
--- a/style/default/dashboard-admin.html
+++ b/style/default/dashboard-admin.html
@@ -32,8 +32,6 @@
                     <div class="dropdown-divider"></div>
                     <a class="dropdown-item" href="?page=password">Passwort ändern</a>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="?page=invite">Grid Invite</a>
-                    <div class="dropdown-divider"></div>
                     <a class="dropdown-item" href="#" data-toggle="modal" data-target="#logoutModal">Logout</a>
                 </div>
             </li>
diff --git a/style/default/dashboard.html b/style/default/dashboard.html
index 63940f4..c591db6 100644
--- a/style/default/dashboard.html
+++ b/style/default/dashboard.html
@@ -32,8 +32,6 @@
                     <div class="dropdown-divider"></div>
                     <a class="dropdown-item" href="?page=password">Passwort ändern</a>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="?page=invite">Grid Invite</a>
-                    <div class="dropdown-divider"></div>
                     <a class="dropdown-item" href="#" data-toggle="modal" data-target="#logoutModal">Logout</a>
                 </div>
             </li>