diff --git a/.dockerignore b/.dockerignore
index 27a52530f1..0f03be5885 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,5 @@
 **/node_modules
 client/dist/images
 data-node
+.env
+**/.env
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 232bff081a..e4db35f91f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,6 @@
 # Base node image
 FROM node:19-alpine AS node
 COPY . /app
-# Copy .env file
-COPY .env .env
 # Install dependencies
 WORKDIR /app
 RUN npm ci
@@ -11,9 +9,6 @@ RUN npm ci
 ENV NODE_OPTIONS="--max-old-space-size=2048"
 RUN npm run frontend
 
-# Remove .env file after build
-RUN rm .env
-
 # Node API setup
 EXPOSE 3080
 ENV HOST=0.0.0.0
diff --git a/client/src/components/Endpoints/EditPresetDialog.jsx b/client/src/components/Endpoints/EditPresetDialog.jsx
index 7e02c321c6..8ec437ba91 100644
--- a/client/src/components/Endpoints/EditPresetDialog.jsx
+++ b/client/src/components/Endpoints/EditPresetDialog.jsx
@@ -238,7 +238,7 @@ const EditPresetDialog = ({ open, onOpenChange, preset: _preset, title }) => {
               )}
               {preset?.endpoint === 'gptPlugins' && showAgentSettings && (
                 <AgentSettings
-                  agent={preset.agent}
+                  agent={preset.agentOptions.agent}
                   skipCompletion={preset.agentOptions.skipCompletion}
                   model={preset.agentOptions.model}
                   endpoint={preset.agentOptions.endpoint}
diff --git a/client/src/components/Endpoints/Plugins/AgentSettings.jsx b/client/src/components/Endpoints/Plugins/AgentSettings.jsx
index 194cef1f2c..3d9ed725ed 100644
--- a/client/src/components/Endpoints/Plugins/AgentSettings.jsx
+++ b/client/src/components/Endpoints/Plugins/AgentSettings.jsx
@@ -65,7 +65,7 @@ function Settings(props) {
           </div>
           <div className="grid w-full items-center gap-2 grid-cols-2">
             <HoverCard openDelay={500}>
-              <HoverCardTrigger className='w-1/2'>
+              <HoverCardTrigger className='w-[100px]'>
                 <label
                   htmlFor="functions-agent"
                   className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70 dark:text-gray-50"
@@ -77,7 +77,7 @@ function Settings(props) {
               <OptionHover type="func" side="right" />
             </HoverCard>
             <HoverCard openDelay={500}>
-              <HoverCardTrigger className='w-1/2 ml-[-60px]'>
+              <HoverCardTrigger className='w-[100px] ml-[-60px]'>
                 <label
                   htmlFor="skip-completion"
                   className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70 dark:text-gray-50"