diff --git a/ui/litellm-dashboard/src/components/team/team_info.tsx b/ui/litellm-dashboard/src/components/team/team_info.tsx
index bfb243637ee..cbcdde89da1 100644
--- a/ui/litellm-dashboard/src/components/team/team_info.tsx
+++ b/ui/litellm-dashboard/src/components/team/team_info.tsx
@@ -492,14 +492,12 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
             <Card>
               <div className="flex justify-between items-center mb-4">
                 <Title>Team Settings</Title>
-                {canEditTeam && (
-                  <Button 
-                    type="primary"
-                    className="bg-blue-500"
+                {(canEditTeam && !isEditing) && (
+                  <TremorButton 
                     onClick={() => setIsEditing(true)}
                   >
                     Edit Settings
-                  </Button>
+                  </TremorButton>
                 )}
               </div>
 
@@ -524,7 +522,7 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
                     name="team_alias"
                     rules={[{ required: true, message: "Please input a team name" }]}
                   >
-                    <Input />
+                    <Input type=""/>
                   </Form.Item>
                   
                   <Form.Item label="Models" name="models">
@@ -592,9 +590,9 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
                     <Button onClick={() => setIsEditing(false)}>
                       Cancel
                     </Button>
-                    <Button type="primary" htmlType="submit" className="bg-blue-500">
+                    <TremorButton>
                       Save Changes
-                    </Button>
+                    </TremorButton>
                   </div>
                 </Form>
               ) : (
@@ -628,7 +626,7 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
                   </div>
                   <div>
                     <Text className="font-medium">Budget</Text>
-                    <div>Max: ${info.max_budget || 'Unlimited'}</div>
+                      <div>Max: {info.max_budget !== null ? `$${info.max_budget}` : 'No Limit'}</div>
                     <div>Reset: {info.budget_duration || 'Never'}</div>
                   </div>
                   <div>