diff --git a/src/222/main/resources/META-INF/autodev-core.xml b/src/222/main/resources/META-INF/autodev-core.xml
index 041a251a92..06448d8ce4 100644
--- a/src/222/main/resources/META-INF/autodev-core.xml
+++ b/src/222/main/resources/META-INF/autodev-core.xml
@@ -12,20 +12,16 @@
                                  id="cc.unitmesh.devti.settings.AutoDevSettingsConfigurable"
                                  displayName="AutoDev"/>
 
-        <projectService serviceImplementation="cc.unitmesh.devti.settings.configurable.CoUnitProjectSettingsService"/>
         <projectConfigurable provider="cc.unitmesh.devti.settings.configurable.CoUnitToolConfigurableProvider"
                              parentId="cc.unitmesh.devti.settings.AutoDevSettingsConfigurable"
                              id="cc.unitmesh.counit"
                              bundle="messages.AutoDevBundle" key="counit.name"/>
 
-        <projectService serviceImplementation="cc.unitmesh.devti.settings.custom.TeamPromptsProjectSettingsService"/>
         <projectConfigurable provider="cc.unitmesh.devti.settings.custom.TeamPromptsConfigurableProvider"
                              parentId="cc.unitmesh.devti.settings.AutoDevSettingsConfigurable"
                              id="cc.unitmesh.promptLibrary"
                              bundle="messages.AutoDevBundle" key="settings.external.team.prompts.name"/>
 
-
-        <projectService serviceImplementation="cc.unitmesh.devti.settings.coder.AutoDevCoderSettingService"/>
         <projectConfigurable provider="cc.unitmesh.devti.settings.coder.AutoDevCoderConfigurableProvider"
                              parentId="cc.unitmesh.devti.settings.AutoDevSettingsConfigurable"
                              id="cc.unitmesh.autodevCoder"
@@ -183,6 +179,7 @@
                icon="cc.unitmesh.devti.AutoDevIcons.AI_COPILOT" searchable="false">
 
             <add-to-group group-id="ShowIntentionsGroup" relative-to-action="ShowIntentionActions" anchor="after"/>
+            <add-to-group group-id="Floating.CodeToolbar" anchor="first"/>
         </group>
 
         <!-- For right click -->
@@ -208,7 +205,7 @@
             </action>
 
             <action id="cc.unitmesh.devti.actions.chat.GenTestDataAction"
-                    class="cc.unitmesh.devti.actions.chat.GenTestDataAction" text="Generate Test data (APIs)"
+                    class="cc.unitmesh.devti.actions.chat.GenTestDataAction" text="Generate Test Data (APIs)"
                     description="Ask AI write this code">
             </action>
 
diff --git a/src/233/main/resources/META-INF/autodev-core.xml b/src/233/main/resources/META-INF/autodev-core.xml
index 373471f4ed..06448d8ce4 100644
--- a/src/233/main/resources/META-INF/autodev-core.xml
+++ b/src/233/main/resources/META-INF/autodev-core.xml
@@ -205,7 +205,7 @@
             </action>
 
             <action id="cc.unitmesh.devti.actions.chat.GenTestDataAction"
-                    class="cc.unitmesh.devti.actions.chat.GenTestDataAction" text="Generate Test data (APIs)"
+                    class="cc.unitmesh.devti.actions.chat.GenTestDataAction" text="Generate Test Data (APIs)"
                     description="Ask AI write this code">
             </action>
 
diff --git a/src/main/resources/messages/AutoDevBundle.properties b/src/main/resources/messages/AutoDevBundle.properties
index f1d57cfd55..25112ba327 100644
--- a/src/main/resources/messages/AutoDevBundle.properties
+++ b/src/main/resources/messages/AutoDevBundle.properties
@@ -31,7 +31,7 @@ intentions.crud.new.family.name=AutoCrud with this
 intentions.chat.selected.code.name=Chat with this code
 intentions.chat.selected.fragment.name=Chat with {0} fragment
 intentions.chat.selected.element.name=Chat with ''{0}'' {1}
-chat.too.long.user.message=Message has is {0} tokens, it's too looooooooooooooooooong 
+chat.too.long.user.message=Message has is {0} tokens too looooooooooooooooooong
 intentions.companion.api.name=Talk with API
 intentions.companion.api.family.name=AutoDev: Talk with API
 intentions.living.documentation.name=Generate documentation