diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs
index 0831c6042..065fce1e0 100644
--- a/BeWo/BeWoApp.xaml.cs
+++ b/BeWo/BeWoApp.xaml.cs
@@ -56,7 +56,7 @@ namespace BeWo
 		public static LoginControl LoginControl;
 		public static MainControl MainControl;
 
-		public static string ShortVersion = "3.30.2";
+		public static string ShortVersion = "3.31";
 		public static string Version => BeWoAppInfo.BeWoAppVersion.ToString();
 		public static int RenderTier = 0;
 		
@@ -788,6 +788,10 @@ namespace BeWo
 					{
 						url += "/service";
 					}
+					//if (url.IndexOf("/service_ai") < 0)
+					//{
+					//	url += "/service_ai";
+					//}
 
 					return new Uri(String.Format("https://{0}", url));
 				}
diff --git a/BeWo/View/Controls/AI/AiChatButton.xaml b/BeWo/View/Controls/AI/AiChatButton.xaml
index 2e0ceb0a9..2bcfcbbb6 100644
--- a/BeWo/View/Controls/AI/AiChatButton.xaml
+++ b/BeWo/View/Controls/AI/AiChatButton.xaml
@@ -23,17 +23,14 @@
     <Grid Visibility="{Binding IsVisible, Converter={StaticResource BoolVisibilityConverter}}">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="auto" />
-            <ColumnDefinition Width="12" />
             <ColumnDefinition Width="auto" />
-            <ColumnDefinition Width="12" />
             <ColumnDefinition Width="auto" />
-            <ColumnDefinition Width="12" />
             <ColumnDefinition Width="auto" />
         </Grid.ColumnDefinitions>
         <Button
             x:Name="btnOpenAiConversation"
             Grid.Column="0"
-            Margin="0"
+            Margin="0,0,6,0"
             Background="Transparent"
             Command="{Binding OpenConversationPopupCommand}"
             Content="{StaticResource AiDesignsIconKIChatWeissOrange}"
@@ -44,9 +41,9 @@
                 </Button.InputBindings>-->
         </Button>
         <Button
-            x:Name="btnOpenAiDocumantation"
-            Grid.Column="2"
-            Margin="0"
+            x:Name="btnOpenAiPromptbaustein"
+            Grid.Column="1"
+            Margin="6,0"
             Background="Transparent"
             Command="{Binding OpenAllPromptsPopupCommand}"
             Content="{StaticResource AiDesignsIconKIFunktionWeissGruen}"
@@ -59,8 +56,9 @@
         </Button>
         <Image
             x:Name="imgWarning"
-            Grid.Column="4"
+            Grid.Column="2"
             Height="20"
+            Margin="6,0"
             Source="{Binding Source={x:Static draw:SystemIcons.Warning}, Converter={StaticResource IconToImageSourceConverter}, Mode=OneWay}"
             Visibility="{Binding IsContextSizeTooBig, Converter={StaticResource BoolVisibilityConverter}}">
             <!--  Visibility="{Binding ElementName=btnOpenAi4, Path=Visibility}"  -->
@@ -72,7 +70,8 @@
         </Image>
         <StackPanel
             x:Name="stackpanelUndoRedo"
-            Grid.Column="6"
+            Grid.Column="3"
+            Margin="6,0,0,0"
             Orientation="Horizontal"
             Visibility="{Binding IsHistoryVisible, Converter={StaticResource BoolVisibilityConverter}}">
             <Button
diff --git a/BeWo/View/Controls/AI/AiChatButton.xaml.cs b/BeWo/View/Controls/AI/AiChatButton.xaml.cs
index 4f8d734d1..d10c55428 100644
--- a/BeWo/View/Controls/AI/AiChatButton.xaml.cs
+++ b/BeWo/View/Controls/AI/AiChatButton.xaml.cs
@@ -98,16 +98,24 @@ namespace BeWo.View.Controls.AI
 			if(orientation == AiChatButtonOrientation.Left)
 			{
 				Grid.SetColumn(btnOpenAiConversation, 0);
-				Grid.SetColumn(btnOpenAiDocumantation, 2);
-				Grid.SetColumn(imgWarning, 4);
-				Grid.SetColumn(stackpanelUndoRedo, 6);
+				Grid.SetColumn(btnOpenAiPromptbaustein, 1);
+				Grid.SetColumn(imgWarning, 2);
+				Grid.SetColumn(stackpanelUndoRedo, 3);
+
+				stackpanelUndoRedo.Margin = new Thickness(6, 0, 0, 0);
+				btnOpenAiConversation.Margin = new Thickness(0, 0, 6, 0);
+				btnOpenAiPromptbaustein.Margin = new Thickness(6, 0, 6, 0);
 			}
 			else if(orientation == AiChatButtonOrientation.Right)
 			{
-				Grid.SetColumn(btnOpenAiConversation, 4);
-				Grid.SetColumn(btnOpenAiDocumantation, 6);
-				Grid.SetColumn(imgWarning, 2);
 				Grid.SetColumn(stackpanelUndoRedo, 0);
+				Grid.SetColumn(imgWarning, 1);
+				Grid.SetColumn(btnOpenAiConversation, 2);
+				Grid.SetColumn(btnOpenAiPromptbaustein, 3);
+
+				stackpanelUndoRedo.Margin = new Thickness(0, 0, 6, 0);
+				btnOpenAiConversation.Margin = new Thickness(6, 0, 6, 0);
+				btnOpenAiPromptbaustein.Margin = new Thickness(6, 0, 0, 0);
 			}
 			else
 			{
diff --git a/BeWo/app.config b/BeWo/app.config
index 38e11e86f..417b2e300 100644
--- a/BeWo/app.config
+++ b/BeWo/app.config
@@ -13,17 +13,17 @@
       <basicHttpBinding>
         <binding name="BeWoBasicEndpoint" closeTimeout="00:05:00" openTimeout="00:10:00" receiveTimeout="00:10:00" sendTimeout="00:10:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxBufferSize="2147483647" maxReceivedMessageSize="2147483647" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true" messageEncoding="Text">
           <readerQuotas maxDepth="128" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="4096" maxNameTableCharCount="16384" />
-          <security mode="None" />
+          <security mode="Transport" />
           <!-- mode="Transport" für https und "None" sonst-->
         </binding>
         <binding name="BeWoStreamingEndpoint" receiveTimeout="10:10:00" sendTimeout="10:01:00" maxBufferSize="65536" maxReceivedMessageSize="67108864" transferMode="StreamedRequest" useDefaultWebProxy="true" messageEncoding="Text">
           <readerQuotas maxDepth="128" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384" />
-          <security mode="None" />
+          <security mode="Transport" />
           <!-- mode="Transport" für https und "None" sonst-->
         </binding>
         <binding name="QueryServiceEndpoint" closeTimeout="00:10:00" openTimeout="00:10:00" receiveTimeout="00:10:00" sendTimeout="00:10:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxBufferSize="2147483647" maxReceivedMessageSize="2147483647" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true" messageEncoding="Text">
           <readerQuotas maxDepth="128" maxStringContentLength="2147483647" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384" />
-          <security mode="None">
+          <security mode="Transport">
             <transport clientCredentialType="None" proxyCredentialType="None" realm=""/>
             <message clientCredentialType="UserName" algorithmSuite="Default"/>
           </security>
diff --git a/Host/Host.csproj.user b/Host/Host.csproj.user
index 8fd09928c..16d56484a 100644
--- a/Host/Host.csproj.user
+++ b/Host/Host.csproj.user
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <NameOfLastUsedPublishProfile>C:\Projects\Bewo\BeWo - Main\Host\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress>
     </Use64BitIISExpress>
     <IISExpressSSLPort />
diff --git a/Server/Components/ServerUtils/ApiFacade/HttpClientFacade.cs b/Server/Components/ServerUtils/ApiFacade/HttpClientFacade.cs
index 2e1c16103..a7b725f3b 100644
--- a/Server/Components/ServerUtils/ApiFacade/HttpClientFacade.cs
+++ b/Server/Components/ServerUtils/ApiFacade/HttpClientFacade.cs
@@ -24,6 +24,16 @@ namespace BeWo.ServerUtils.ApiFacade
 	{
 		private ILog _logger;
 
+		public bool DirectConnect { get; private set; }
+		public string Base_Url { get; private set; }
+
+		public HttpMethod Method { get; set; } = HttpMethod.Get;
+		public Dictionary<string, string> Headers { get; set; } = new Dictionary<string, string>();
+		public Dictionary<string, string> Parameters { get; set; } = new Dictionary<string, string>();
+		public string ContentType { get; set; } = "application/x-www-form-urlencoded";
+		public Encoding Encoding { get; set; } = Encoding.UTF8;
+		public TimeSpan Timeout { get; set; } = TimeSpan.FromSeconds(30);
+
 		public HttpClientFacade(string base_url, string api_key, bool directConntect = true)
 		{
 			if (string.IsNullOrEmpty(base_url))
@@ -40,16 +50,6 @@ namespace BeWo.ServerUtils.ApiFacade
 			_logger = LoggerUtils.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 		}
 
-		public bool DirectConnect { get; private set; }
-		public string Base_Url { get; private set; }
-
-		public HttpMethod Method { get; set; } = HttpMethod.Get;
-		public Dictionary<string, string> Headers { get; set; } = new Dictionary<string, string>();
-		public Dictionary<string, string> Parameters { get; set; } = new Dictionary<string, string>();
-		public string ContentType { get; set; } = "application/x-www-form-urlencoded";
-		public Encoding Encoding { get; set; } = Encoding.UTF8;
-		public TimeSpan Timeout { get; set; } = TimeSpan.FromSeconds(30);
-
 		/// <summary>
 		/// Führt einen Request aus, erwartet einen komplexen Datentyp: Schaue Verweise für Beispiele.
 		/// </summary>