diff --git a/apps/app/components/onboarding/invite-members.tsx b/apps/app/components/onboarding/invite-members.tsx
index 669c30a48..8ebce0a07 100644
--- a/apps/app/components/onboarding/invite-members.tsx
+++ b/apps/app/components/onboarding/invite-members.tsx
@@ -4,8 +4,7 @@ import useToast from "hooks/use-toast";
 import workspaceService from "services/workspace.service";
 import { IUser } from "types";
 // ui components
-import {  MultiInput, PrimaryButton, SecondaryButton } from "components/ui";
-
+import { MultiInput, PrimaryButton, SecondaryButton } from "components/ui";
 
 type Props = {
   setStep: React.Dispatch<React.SetStateAction<number>>;
diff --git a/apps/app/components/onboarding/workspace.tsx b/apps/app/components/onboarding/workspace.tsx
index cb151526f..35453fc55 100644
--- a/apps/app/components/onboarding/workspace.tsx
+++ b/apps/app/components/onboarding/workspace.tsx
@@ -17,7 +17,6 @@ import { CreateWorkspaceForm } from "components/workspace";
 // ui
 import { PrimaryButton } from "components/ui";
 
-
 type Props = {
   setStep: React.Dispatch<React.SetStateAction<number>>;
   setWorkspace: React.Dispatch<React.SetStateAction<any>>;
@@ -64,15 +63,15 @@ export const Workspace: React.FC<Props> = ({ setStep, setWorkspace }) => {
     <div className="grid w-full place-items-center">
       <Tab.Group
         as="div"
-        className="flex w-full max-w-xl flex-col  rounded-[10px] bg-white shadow-md"
+        className="flex w-full max-w-xl flex-col rounded-[10px] bg-white shadow-md"
       >
         <Tab.List
           as="div"
-          className="text-gray-8 flex items-center justify-start gap-3 px-10 pt-7 text-base"
+          className="text-gray-8 flex items-center justify-start gap-3 px-4 pt-4 text-sm"
         >
           <Tab
             className={({ selected }) =>
-              `rounded-3xl border px-5 py-2 outline-none ${
+              `rounded-3xl border px-4 py-2 outline-none ${
                 selected
                   ? "border-theme bg-theme text-white"
                   : "border-gray-300 bg-white hover:bg-hover-gray"
@@ -103,8 +102,8 @@ export const Workspace: React.FC<Props> = ({ setStep, setWorkspace }) => {
             />
           </Tab.Panel>
           <Tab.Panel>
-            <div className="mt-6" >
-              <div className="divide-y py-8">
+            <div className="mt-6">
+              <div className="divide-y pb-8 px-4">
                 {invitations && invitations.length > 0 ? (
                   invitations.map((invitation) => (
                     <div key={invitation.id}>
@@ -163,14 +162,10 @@ export const Workspace: React.FC<Props> = ({ setStep, setWorkspace }) => {
                   </div>
                 )}
               </div>
-              <div className="flex w-full items-center justify-center rounded-b-[10px]  py-7  ">
+              <div className="flex w-full items-center justify-center rounded-b-[10px] py-7">
                 <PrimaryButton
                   type="submit"
-                  className={`flex w-1/2 items-center justify-center text-center text-sm ${
-                    isJoiningWorkspaces || invitationsRespond.length === 0
-                      ? "cursor-not-allowed opacity-80"
-                      : ""
-                  }`}
+                  className="w-1/2 text-center"
                   size="md"
                   disabled={isJoiningWorkspaces || invitationsRespond.length === 0}
                 >
diff --git a/apps/app/components/ui/buttons/danger-button.tsx b/apps/app/components/ui/buttons/danger-button.tsx
index 5bab0322c..1967d3b11 100644
--- a/apps/app/components/ui/buttons/danger-button.tsx
+++ b/apps/app/components/ui/buttons/danger-button.tsx
@@ -13,7 +13,7 @@ export const DangerButton: React.FC<ButtonProps> = ({
 }) => (
   <button
     type={type}
-    className={`${className} border border-red-500 font-medium duration-300 ${
+    className={`${className} border font-medium duration-300 ${
       size === "sm"
         ? "rounded px-3 py-2 text-xs"
         : size === "md"
@@ -22,12 +22,12 @@ export const DangerButton: React.FC<ButtonProps> = ({
     } ${
       disabled
         ? "cursor-not-allowed border-gray-300 bg-gray-300 text-black hover:border-gray-300 hover:border-opacity-100 hover:bg-gray-300 hover:bg-opacity-100 hover:text-black"
-        : ""
+        : "border-red-500"
     } ${
       outline
         ? "bg-transparent hover:bg-red-500 hover:text-white"
-        : "bg-red-500 text-white hover:border-opacity-90 hover:bg-opacity-90"
-    } ${loading ? "cursor-wait" : ""}`}
+        : "bg-red-500 hover:border-opacity-90 hover:bg-opacity-90"
+    } ${!disabled && !outline ? "text-white" : ""} ${loading ? "cursor-wait" : ""}`}
     onClick={onClick}
     disabled={disabled || loading}
   >
diff --git a/apps/app/components/ui/buttons/primary-button.tsx b/apps/app/components/ui/buttons/primary-button.tsx
index 84a84e015..805afc22d 100644
--- a/apps/app/components/ui/buttons/primary-button.tsx
+++ b/apps/app/components/ui/buttons/primary-button.tsx
@@ -13,7 +13,7 @@ export const PrimaryButton: React.FC<ButtonProps> = ({
 }) => (
   <button
     type={type}
-    className={`${className} border border-theme font-medium duration-300 ${
+    className={`${className} border font-medium duration-300 ${
       size === "sm"
         ? "rounded px-3 py-2 text-xs"
         : size === "md"
@@ -22,12 +22,12 @@ export const PrimaryButton: React.FC<ButtonProps> = ({
     } ${
       disabled
         ? "cursor-not-allowed border-gray-300 bg-gray-300 text-black hover:border-gray-300 hover:border-opacity-100 hover:bg-gray-300 hover:bg-opacity-100 hover:text-black"
-        : ""
+        : "border-theme"
     } ${
       outline
         ? "bg-transparent hover:bg-theme hover:text-white"
-        : "bg-theme text-white hover:border-opacity-90 hover:bg-opacity-90"
-    } ${loading ? "cursor-wait" : ""}`}
+        : "bg-theme hover:border-opacity-90 hover:bg-opacity-90"
+    } ${!disabled && !outline ? "text-white" : ""} ${loading ? "cursor-wait" : ""}`}
     onClick={onClick}
     disabled={disabled || loading}
   >
diff --git a/apps/app/components/ui/buttons/secondary-button.tsx b/apps/app/components/ui/buttons/secondary-button.tsx
index f43cf8a2c..479dca749 100644
--- a/apps/app/components/ui/buttons/secondary-button.tsx
+++ b/apps/app/components/ui/buttons/secondary-button.tsx
@@ -13,7 +13,7 @@ export const SecondaryButton: React.FC<ButtonProps> = ({
 }) => (
   <button
     type={type}
-    className={`${className} border border-gray-300 font-medium duration-300 ${
+    className={`${className} border font-medium duration-300 ${
       size === "sm"
         ? "rounded px-3 py-2 text-xs"
         : size === "md"
diff --git a/apps/app/components/workspace/create-workspace-form.tsx b/apps/app/components/workspace/create-workspace-form.tsx
index 189121b27..c1555faa5 100644
--- a/apps/app/components/workspace/create-workspace-form.tsx
+++ b/apps/app/components/workspace/create-workspace-form.tsx
@@ -17,7 +17,6 @@ import { USER_WORKSPACES } from "constants/fetch-keys";
 // constants
 import { COMPANY_SIZE } from "constants/workspace";
 
-
 type Props = {
   onSubmit: (res: IWorkspace) => void;
 };
@@ -84,7 +83,7 @@ export const CreateWorkspaceForm: React.FC<Props> = ({ onSubmit }) => {
     >
       <div className="flex w-full max-w-xl flex-col">
         <div className="flex flex-col rounded-[10px] bg-white shadow-md">
-          <div className="flex flex-col justify-between gap-3 px-10 py-7">
+          <div className="flex flex-col justify-between gap-3 px-4 py-7">
             <div className="flex flex-col items-start justify-center gap-2.5">
               <span>Workspace name</span>
               <Input
@@ -97,13 +96,14 @@ export const CreateWorkspaceForm: React.FC<Props> = ({ onSubmit }) => {
                 validations={{
                   required: "Workspace name is required",
                 }}
+                placeholder="e.g. My Workspace"
                 error={errors.name}
               />
             </div>
             <div className="flex flex-col items-start justify-center gap-2.5">
               <span>Workspace URL</span>
               <div className="flex w-full items-center rounded-md border border-gray-300 px-3">
-                <span className="text-sm text-slate-600">{"https://app.plane.so/"}</span>
+                <span className="text-sm text-slate-600">https://app.plane.so/</span>
                 <Input
                   mode="trueTransparent"
                   autoComplete="off"
@@ -118,7 +118,7 @@ export const CreateWorkspaceForm: React.FC<Props> = ({ onSubmit }) => {
             </div>
           </div>
 
-          <div className="flex flex-col items-start justify-center gap-2.5 border-t border-gray-300 px-10 py-7">
+          <div className="flex flex-col items-start justify-center gap-2.5 border-t border-gray-300 px-4 py-7">
             <span>How large is your company</span>
             <div className="w-full">
               <Controller
@@ -142,12 +142,12 @@ export const CreateWorkspaceForm: React.FC<Props> = ({ onSubmit }) => {
                 )}
               />
               {errors.company_size && (
-              <span className="text-sm text-red-500">{errors.company_size.message}</span>
-            )}
+                <span className="text-sm text-red-500">{errors.company_size.message}</span>
+              )}
             </div>
           </div>
 
-          <div className="flex w-full items-center justify-center rounded-b-[10px]  py-7  ">
+          <div className="flex w-full items-center justify-center rounded-b-[10px] py-7">
             <PrimaryButton
               type="submit"
               className="flex w-1/2 items-center justify-center text-center"
diff --git a/apps/app/constants/workspace.ts b/apps/app/constants/workspace.ts
index 8fdc4ee97..2d8960c37 100644
--- a/apps/app/constants/workspace.ts
+++ b/apps/app/constants/workspace.ts
@@ -32,8 +32,7 @@ export const ONBOARDING_CARDS = {
     imgURL: Welcome,
     step: "1/5",
     title: "Welcome to Plane",
-    description:
-      "Plane helps you plan your issues, cycles, and product modules to ship faster.",
+    description: "Plane helps you plan your issues, cycles, and product modules to ship faster.",
   },
   issue: {
     imgURL: Issue,
@@ -54,7 +53,7 @@ export const ONBOARDING_CARDS = {
     step: "4/5",
     title: "Break into Modules ",
     description:
-      "Modules break your big think into Projects or Features , to help you organize better.",
+      "Modules break your big think into Projects or Features, to help you organize better.",
   },
   commandMenu: {
     imgURL: CommandMenu,