diff --git a/README.md b/README.md
index 9f2590080..875125433 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@
 - **[Activity Logs](https://infisical.com/docs/getting-started/dashboard/audit-logs)** to record every action taken in a project
 - **[Point-in-time Secrets Recovery](https://infisical.com/docs/getting-started/dashboard/pit-recovery)** for rolling back to any snapshot of your secrets
 - **Role-based Access Controls** per environment
-- 🔜 **2FA** (next week)
+- 🔜 **2FA** (more options coming soon)
 - 🔜 **1-Click Deploy** to AWS
 - 🔜 **Automatic Secret Rotation**
 - 🔜 **Smart Security Alerts**
diff --git a/frontend/src/components/dashboard/DropZone.tsx b/frontend/src/components/dashboard/DropZone.tsx
index c01ed39fa..2fddfcf9c 100644
--- a/frontend/src/components/dashboard/DropZone.tsx
+++ b/frontend/src/components/dashboard/DropZone.tsx
@@ -175,7 +175,7 @@ const DropZone = ({
         id="fileSelect"
         type="file"
         className="opacity-0 absolute w-full h-full"
-        accept=".txt,.env,.yml"
+        accept=""
         onChange={handleFileSelect}
       />
       {errorDragAndDrop ? <div className="my-3 max-w-xl opacity-80" /> : <div className="" />}
diff --git a/frontend/src/components/v2/Input/Input.tsx b/frontend/src/components/v2/Input/Input.tsx
index ed9ead646..e6524c839 100644
--- a/frontend/src/components/v2/Input/Input.tsx
+++ b/frontend/src/components/v2/Input/Input.tsx
@@ -12,7 +12,7 @@ type Props = {
 };
 
 const inputVariants = cva(
-  'input w-full py-2 text-gray-400 placeholder-gray-500 placeholder-opacity-50 outline-none focus:ring-2',
+  'input w-full py-[0.375rem] text-gray-400 placeholder:text-sm placeholder-gray-500 placeholder-opacity-50 outline-none focus:ring-2',
   {
     variants: {
       size: {
@@ -84,7 +84,7 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(
   ): JSX.Element => {
     return (
       <div className={inputParentContainerVariants({ isRounded, isError, isFullWidth, variant })}>
-        {leftIcon && <span className="absolute left-0 ml-3">{leftIcon}</span>}
+        {leftIcon && <span className="absolute left-0 ml-3 text-sm">{leftIcon}</span>}
         <input
           {...props}
           required={isRequired}
diff --git a/frontend/src/components/v2/Tag/Tag.tsx b/frontend/src/components/v2/Tag/Tag.tsx
index 11dc41d45..32c62c165 100644
--- a/frontend/src/components/v2/Tag/Tag.tsx
+++ b/frontend/src/components/v2/Tag/Tag.tsx
@@ -7,14 +7,14 @@ type Props = {
   className?: string;
 } & VariantProps<typeof tagVariants>;
 
-const tagVariants = cva('inline-flex whitespace-nowrap text-sm rounded-md mx-1 text-bunker-200 ', {
+const tagVariants = cva('inline-flex whitespace-nowrap text-sm rounded-sm mr-1.5 text-bunker-200 ', {
   variants: {
     colorSchema: {
       gray: 'bg-mineshaft-500',
       red: 'bg-red/80 text-bunker-100'
     },
     size: {
-      sm: 'px-2 py-1'
+      sm: 'px-1 py-0.5'
     }
   }
 });
diff --git a/frontend/src/layouts/AppLayout/AppLayout.tsx b/frontend/src/layouts/AppLayout/AppLayout.tsx
index 06fc6d5f7..b071c3272 100644
--- a/frontend/src/layouts/AppLayout/AppLayout.tsx
+++ b/frontend/src/layouts/AppLayout/AppLayout.tsx
@@ -227,7 +227,7 @@ export const AppLayout = ({ children }: LayoutProps) => {
                     <Select
                       defaultValue={currentWorkspace?._id}
                       value={currentWorkspace?._id}
-                      className="w-full py-2.5 bg-mineshaft-600 font-medium"
+                      className="w-full py-2.5 bg-mineshaft-600 font-medium truncate"
                       onValueChange={(value) => {
                         router.push(`/dashboard/${value}`);
                       }}
diff --git a/frontend/src/views/Settings/OrgSettingsPage/components/OrgIncidentContactsTable/OrgIncidentContactsTable.tsx b/frontend/src/views/Settings/OrgSettingsPage/components/OrgIncidentContactsTable/OrgIncidentContactsTable.tsx
index 296e5031d..970ca8774 100644
--- a/frontend/src/views/Settings/OrgSettingsPage/components/OrgIncidentContactsTable/OrgIncidentContactsTable.tsx
+++ b/frontend/src/views/Settings/OrgSettingsPage/components/OrgIncidentContactsTable/OrgIncidentContactsTable.tsx
@@ -114,6 +114,11 @@ export const OrgIncidentContactsTable = ({
                 ))}
             </TBody>
           </Table>
+          {contacts
+          ?.filter(({ email }) => email.toLocaleLowerCase().includes(searchContact))
+          ?.length === 0 && (
+            <div className='py-4 bg-bunker-800 text-sm text-center text-bunker-400 w-full mx-auto flex justify-center'>No incident contacts found</div>
+          )}
         </TableContainer>
       </div>
       <Modal
diff --git a/frontend/src/views/Settings/OrgSettingsPage/components/OrgMembersTable/OrgMembersTable.tsx b/frontend/src/views/Settings/OrgSettingsPage/components/OrgMembersTable/OrgMembersTable.tsx
index e23bf42ba..2911ae603 100644
--- a/frontend/src/views/Settings/OrgSettingsPage/components/OrgMembersTable/OrgMembersTable.tsx
+++ b/frontend/src/views/Settings/OrgSettingsPage/components/OrgMembersTable/OrgMembersTable.tsx
@@ -146,7 +146,7 @@ export const OrgMembersTable = ({
                 const userWs = workspaceMemberships?.[user?._id];
 
                 return (
-                  <Tr key={`org-membership-${orgMembershipId}`}>
+                  <Tr key={`org-membership-${orgMembershipId}`} className="w-full">
                     <Td>{name}</Td>
                     <Td>{email}</Td>
                     <Td>
@@ -192,20 +192,21 @@ export const OrgMembersTable = ({
                       )}
                     </Td>
                     <Td>
-                      <IconButton
+                      {userId !== user?._id && <IconButton
                         ariaLabel="delete"
                         colorSchema="danger"
                         isDisabled={userId === user?._id}
                         onClick={() => handlePopUpOpen('removeMember', { id: orgMembershipId })}
                       >
                         <FontAwesomeIcon icon={faTrash} />
-                      </IconButton>
+                      </IconButton>}
                     </Td>
                   </Tr>
                 );
               })}
             </TBody>
           </Table>
+          {filterdUser.length === 0 && <tr className='bg-bunker-800 text-sm py-4 text-center text-bunker-400 w-full mx-auto flex justify-center'><td className='col-span-5'>No project members found</td></tr>}
         </TableContainer>
       </div>
       <Modal