diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9f3daa1..79c7d07 100755
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -21,6 +21,7 @@
   <component name="ChangeListManager">
     <list default="true" id="fc13552d-b118-4828-b78f-fc8714e0cfdc" name="Default Changelist" comment="Final COMMIT!!!">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/templates/faq.tmpl.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/faq.tmpl.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/vendor/js/faq.js" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/js/faq.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -32,7 +33,7 @@
     <execution />
   </component>
   <component name="DarkyenusTimeTracker">
-    <option name="totalTimeSeconds" value="81550" />
+    <option name="totalTimeSeconds" value="83257" />
     <option name="gitIntegration" value="true" />
     <option name="naggedAbout" value="1" />
   </component>
@@ -78,7 +79,7 @@
       <updated>1601618466935</updated>
       <workItem from="1601618467981" duration="36776000" />
       <workItem from="1601809534320" duration="1558000" />
-      <workItem from="1601811106543" duration="9912000" />
+      <workItem from="1601811106543" duration="12734000" />
     </task>
     <task id="LOCAL-00001" summary="Initial commit">
       <created>1601618764031</created>
@@ -213,7 +214,14 @@
       <option name="project" value="LOCAL" />
       <updated>1601827583833</updated>
     </task>
-    <option name="localTasksCounter" value="20" />
+    <task id="LOCAL-00020" summary="Fixing answer text bug #6">
+      <created>1601828809866</created>
+      <option name="number" value="00020" />
+      <option name="presentableId" value="LOCAL-00020" />
+      <option name="project" value="LOCAL" />
+      <updated>1601828809866</updated>
+    </task>
+    <option name="localTasksCounter" value="21" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -249,7 +257,8 @@
     <MESSAGE value="Added room_owner and welcome message thingy(client-side)" />
     <MESSAGE value="Added room_owner and welcome message thingy(server-side)" />
     <MESSAGE value="Fixing a little bug" />
-    <option name="LAST_COMMIT_MESSAGE" value="Fixing a little bug" />
+    <MESSAGE value="Fixing answer text bug #6" />
+    <option name="LAST_COMMIT_MESSAGE" value="Fixing answer text bug #6" />
   </component>
   <component name="WindowStateProjectService">
     <state x="728" y="326" width="800" height="683" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1601632929047">
@@ -288,10 +297,10 @@
       <screen x="0" y="34" width="1920" height="1046" />
     </state>
     <state x="441" y="192" width="1037" height="736" key="SettingsEditor/0.34.1920.1046@0.34.1920.1046" timestamp="1601632853044" />
-    <state x="555" y="292" width="800" height="535" key="Vcs.Push.Dialog.v2" timestamp="1601827584960">
+    <state x="555" y="292" width="800" height="535" key="Vcs.Push.Dialog.v2" timestamp="1601828810778">
       <screen x="0" y="34" width="1920" height="1046" />
     </state>
-    <state x="555" y="292" width="800" height="535" key="Vcs.Push.Dialog.v2/0.34.1920.1046@0.34.1920.1046" timestamp="1601827584960" />
+    <state x="555" y="292" width="800" height="535" key="Vcs.Push.Dialog.v2/0.34.1920.1046@0.34.1920.1046" timestamp="1601828810778" />
     <state x="809" y="122" width="639" height="876" key="com.intellij.database.view.ui.AbstractDbRefactoringDialog" timestamp="1601632983240">
       <screen x="0" y="34" width="1920" height="1046" />
     </state>
diff --git a/templates/faq.tmpl.html b/templates/faq.tmpl.html
index ca1af03..ab3536b 100755
--- a/templates/faq.tmpl.html
+++ b/templates/faq.tmpl.html
@@ -48,6 +48,7 @@
                     <a class="nav-link" href="[[SHARE_URL]]">This FAQ</a>
                 </li>
             </ul>
+            <button class="btn btn-info mt-2 mt-md-0" data-target="#optionsModal" data-toggle="modal" style="margin-right: 1.5em;">Room-Options</button>
             <form class="form-inline mt-2 mt-md-0" action="?c=default&a=JoinFAQ" method="post">
                 <input class="form-control mr-sm-2" type="text" maxlength="[[MAX_LEN]]" name="code" placeholder="FAQ-Code" aria-label="Join">
                 <button class="btn btn-outline-success my-2 my-sm-0" type="submit">Join FAQ</button>
@@ -108,6 +109,28 @@
     </div>
 </div>
 
+<div class="modal fade" id="optionsModal" tabindex="-1" role="dialog" aria-labelledby="optionsModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="optionsModalLabel">Room-Options</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <span class="text-danger" id="optionsErrorMsg"></span>
+                <div class="form-group">
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-danger" data-dismiss="modal">Discard</button>
+                <button type="button" id="optionsBtn" class="btn btn-success" onclick="saveOptions();">Save</button>
+            </div>
+        </div>
+    </div>
+</div>
+
 <div class="modal fade" id="readMoreModal" tabindex="-1" role="dialog" aria-labelledby="answerModalLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
@@ -173,16 +196,17 @@
             <div class="col-lg-6 col-sm-12 col-md-6 float-left">
                 <p class="lead">Room <span class="text-info">[[ROOM_NAME]]</span> -
                     Code <span class="text-info">[[ROOM_CODE]]</span></p>
+
             </div>
             <div class="col-lg-6 col-sm-12 col-md-6">
                 <label class="float-right col-form-label">
-                    Share-URL
                     <input type="text" class="disabled form-control" disabled value="[[SHARE_URL]]" size="28%">
                 </label>
             </div>
             <br>
             <div class="col-lg-12">
-                <button type="button" class="btn btn-primary float-right" data-toggle="modal" data-target="#askQuestionModal">Ask a question</button>
+                <button type="button" class="btn btn-primary float-left" data-toggle="modal" data-target="#askQuestionModal">Ask a question</button>
+                <button type="button" class="btn btn-secondary float-right" data-toggle="modal" data-target="#askQuestionModal">Copy-URL</button>
             </div>
         </div>
     </div>
diff --git a/vendor/js/faq.js b/vendor/js/faq.js
index 3a60192..07d652e 100644
--- a/vendor/js/faq.js
+++ b/vendor/js/faq.js
@@ -268,7 +268,7 @@ function welcomeMessage()
             welcomeModalText.html( 'You are an guest of this room.<br>This means you are allowed to ask questions.<br>To ask a question, click on "Ask a question", then enter your name and your question.' );
             is_owner = false;
         }
-        setTimeout( function() { welcomeModalClose.prop( 'disabled', false ); }, 1500 );
+        setTimeout( function() { welcomeModalClose.prop( 'disabled', false ); }, 500 );
     }, function()
     {
         is_owner = false;