diff --git a/src/components/Helpers/Inputs/InputCom/index.jsx b/src/components/Helpers/Inputs/InputCom/index.jsx
index 5c98f9f..4dfcc4f 100644
--- a/src/components/Helpers/Inputs/InputCom/index.jsx
+++ b/src/components/Helpers/Inputs/InputCom/index.jsx
@@ -12,7 +12,8 @@ export default function InputCom({
   inputHandler,
   value,
   forgotPassword,
-  onClick
+  onClick,
+  disable
 }) {
   return (
     <div className="input-com">
@@ -37,6 +38,7 @@ export default function InputCom({
           id={name}
           name={name}
           required
+          readOnly={disable}
         />
         {iconName && (
           <div className="absolute right-6 bottom-[10px] z-10">
diff --git a/src/components/Settings/Tabs/PersonalInfoTab.jsx b/src/components/Settings/Tabs/PersonalInfoTab.jsx
index d9fe9f3..5b4ea3a 100644
--- a/src/components/Settings/Tabs/PersonalInfoTab.jsx
+++ b/src/components/Settings/Tabs/PersonalInfoTab.jsx
@@ -127,105 +127,107 @@ export default function PersonalInfoTab({
             <div className="fields w-full">
               {/* inputs starts here */}
               {/* username */}
-              <div className='profile-input my-3'>
-                  <label className='w-full text-slate-600 text-lg'>Username <span className='text-red-500'>*</span></label>
-                  <input className='w-full p-3 text-lg text-slate-500 bg-slate-200 opacity-90 rounded-md outline-0 placeholder:text-slate-500 placeholder:text-lg' 
-                      value={item.username} 
-                      name='username' 
-                      type="text" 
-                      placeholder='username@gamil.com' 
-                      disabled
-                      />
+              <div className="field w-full mb-6">
+                <InputCom
+                  label="User Name"
+                  type="text"
+                  name="username"
+                  placeholder=""
+                  value={item.username}
+                  disable={true}
+                />
               </div>
 
               {/* Email */}
-              <div className='profile-input my-3'>
-                  <label className='w-full text-slate-600 text-lg'>Email <span className='text-red-500'>*</span></label>
-                  <input className='w-full p-3 text-lg text-slate-500 bg-slate-200 opacity-90 rounded-md outline-0 placeholder:text-slate-500 placeholder:text-lg' 
-                      value={inputs.email} 
-                      name='email' 
-                      type="text" 
-                      placeholder='Email' 
-                      onChange={handleChange}
-                      />
+              <div className="field w-full mb-6">
+                <InputCom
+                  label="Email"
+                  type="text"
+                  name="email"
+                  placeholder="Email"
+                  value={inputs.email}
+                  inputHandler={handleChange}
+                />
               </div>
-
-              {/* Fullname */}
-              <div className='profile-input my-3'>
-                  <label className='w-full text-slate-600 text-lg'>Fullname <span className='text-red-500'>*</span></label>
-                  <div className="w-full flex items-center justify-center space-x-1 space-y-1">
-                    <input className='p-3 text-lg text-slate-500 bg-slate-100 rounded-md outline-0 placeholder:text-slate-500 placeholder:text-lg' 
-                      value={inputs.firstname} 
-                      name='firstname' 
-                      type="text" 
-                      placeholder='Firstname' 
-                      onChange={handleChange}
-                      />
-                      <input className='p-3 text-lg text-slate-500 bg-slate-100 rounded-md outline-0 placeholder:text-slate-500 placeholder:text-lg' 
-                      value={inputs.lastname} 
-                      name='lastname' 
-                      type="text" 
-                      placeholder='Lastname' 
-                      onChange={handleChange}
-                      />
-                  </div>
+              {/* first name and last name */}
+              <div className="xl:flex xl:space-x-7 mb-6">
+                <div className="field w-full mb-6 xl:mb-0">
+                  <InputCom
+                    label="First Name"
+                    type="text"
+                    name="firstname"
+                    placeholder="First Name"
+                    value={inputs.firstname}
+                    inputHandler={handleChange}
+                  />
+                </div>
+                <div className="field w-full">
+                  <InputCom
+                    label="Last Name"
+                    type="text"
+                    name="lastname"
+                    placeholder="Last Name"
+                    value={inputs.lastname}
+                    inputHandler={handleChange}
+                  />
+                </div>
               </div>
 
               {/* Country */}
-              <div className='profile-input my-3'>
-                  <label className='w-full text-slate-600 text-lg'>Country <span className='text-red-500'>*</span></label>
-                  <input className='w-full p-3 text-lg text-slate-500 bg-slate-200 opacity-90 rounded-md outline-0 placeholder:text-slate-500 placeholder:text-lg' 
-                      value={item.country} 
-                      name='country' 
-                      type="text" 
-                      disabled
-                    />
+              <div className="field w-full mb-6">
+                <InputCom
+                  label="Country"
+                  type="text"
+                  name="country"
+                  value={item.country}
+                  disable={true}
+                />
               </div>
 
               {/* State/Province */}
-              <div className='profile-input my-3'>
-                  <label className='w-full text-slate-600 text-lg'>State/Province <span className='text-red-500'>*</span></label>
-                  <input className='w-full p-3 text-lg text-slate-500 bg-slate-100 rounded-md outline-0 placeholder:text-slate-500 placeholder:text-lg' 
-                      value={inputs.state} 
-                      name='state' 
-                      type="text" 
-                      placeholder='State' 
-                      onChange={handleChange}
-                      />
+              <div className="field w-full mb-6">
+                <InputCom
+                  label="State/Province"
+                  type="text"
+                  name="state"
+                  placeholder="State"
+                  value={inputs.state}
+                  inputHandler={handleChange}
+                />
               </div>
 
               {/* City */}
-              <div className='profile-input my-3'>
-                  <label className='w-full text-slate-600 text-lg'>City <span className='text-red-500'>*</span></label>
-                  <input className='w-full p-3 text-lg text-slate-500 bg-slate-100 rounded-md outline-0 placeholder:text-slate-500 placeholder:text-lg' 
-                      value={inputs.city} 
-                      name='city' 
-                      type="text" 
-                      placeholder='City' 
-                      onChange={handleChange}
-                      />
+              <div className="field w-full mb-6">
+                <InputCom
+                  label="City"
+                  type="text"
+                  name="state"
+                  placeholder="City"
+                  value={inputs.city}
+                  inputHandler={handleChange}
+                />
               </div>
 
               {/* Preferred Communication*/}
-              <div className='profile-input my-3'>
-                  <label className='text-slate-600 text-lg'>Pref. Communication <span className='text-red-500'>*</span></label>
+              <div className='field w-full mb-6 md:flex items-center space-x-4'>
+                  <label className='input-label text-[#181c32] dark:text-white text-base font-semibold'>Pref. Communication</label>
                   <div className="check-box">
                     <div className="flex items-center justify-start">
-                      <div className="check-input flex items-center">
-                        <input className="mx-2 w-4 h-4 cursor-pointer" type="checkbox" name="prefcomm1" id="" />
-                        <span className="text-slate-600 text-lg">Email</span>
+                      <div className="check-input flex items-center mr-1">
+                        <input className="w-4 h-4 cursor-pointer" type="checkbox" name="prefcomm1" id="" />
+                        <span className="mx-2 text-base text-dark-gray dark:text-white">Email</span>
                       </div>
                       <div className="check-input flex items-center">
-                        <input className="mx-2 w-4 h-4 cursor-pointer" type="checkbox" name="prefcomm2" id="" />
-                        <span className="text-slate-600 text-lg">Phone</span>
+                        <input className="w-4 h-4 cursor-pointer" type="checkbox" name="prefcomm2" id="" />
+                        <span className="mx-2 text-base text-dark-gray dark:text-white">Phone</span>
                       </div>
                     </div>
                   </div>
               </div>
 
               {/* Allow Promotions */}
-              <div className='profile-input my-3 flex items-center space-x-4'>
-                  <label className='text-slate-600 text-lg'>Allow Promotions</label>
+              <div className='field w-full mb-6 flex items-center space-x-4'>
+                  <label className='input-label text-[#181c32] dark:text-white text-base font-semibold'>Allow Promotions</label>
                   <div className="cursor-pointer flex items-center" onClick={()=>setTogglePromotion(prev => !prev)}>
                     <div className={`h-6 w-8 mr-1 p-1 ${togglePromotion ? 'bg-sky-blue flex justify-end items-center': 'bg-slate-200'} rounded-full transition`}>
                       <div className="w-4 h-full bg-white rounded-full"></div>  
@@ -291,57 +293,6 @@ export default function PersonalInfoTab({
                 </div>
               </div>
             </div>
-            <div className="update-profile w-full">
-              <h1 className="text-xl tracking-wide font-bold text-dark-gray dark:text-white flex items-center mb-2">
-                Update Cover
-                <span className="ml-1">
-                  <Icons name="block-question" />
-                </span>
-              </h1>
-              <p className="text-base text-thin-light-gray mb-5">
-                Cover of at least Size
-                <span className="ml-1   text-dark-gray dark:text-white">
-                  1170x920
-                </span>
-                .
-              </p>
-              <div className="flex justify-center">
-                <div className="w-full relative">
-                  <img
-                    src={coverImg}
-                    alt=""
-                    className="w-full h-[120px] rounded-lg overflow-hidden object-cover"
-                  />
-                  <input
-                    ref={coverImgInput}
-                    onChange={(e) => coverImgChangHandler(e)}
-                    type="file"
-                    className="hidden"
-                  />
-                  <div
-                    onClick={browseCoverImg}
-                    className="w-[32px] h-[32px] absolute -bottom-4 right-4 bg-dark-gray hover:bg-pink rounded-full cursor-pointer"
-                  >
-                    <svg
-                      width="32"
-                      height="32"
-                      viewBox="0 0 32 32"
-                      fill="none"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        d="M16.5147 11.5C17.7284 12.7137 18.9234 13.9087 20.1296 15.115C19.9798 15.2611 19.8187 15.4109 19.6651 15.5683C17.4699 17.7635 15.271 19.9587 13.0758 22.1539C12.9334 22.2962 12.7948 22.4386 12.6524 22.5735C12.6187 22.6034 12.5663 22.6296 12.5213 22.6296C11.3788 22.6334 10.2362 22.6297 9.09365 22.6334C9.01498 22.6334 9 22.6034 9 22.536C9 21.4009 9 20.2621 9.00375 19.1271C9.00375 19.0746 9.02997 19.0109 9.06368 18.9772C10.4123 17.6249 11.7609 16.2763 13.1095 14.9277C14.2295 13.8076 15.3459 12.6913 16.466 11.5712C16.4884 11.5487 16.4997 11.5187 16.5147 11.5Z"
-                        fill="white"
-                      />
-                      <path
-                        d="M20.9499 14.2904C19.7436 13.0842 18.5449 11.8854 17.3499 10.6904C17.5634 10.4694 17.7844 10.2446 18.0054 10.0199C18.2639 9.76139 18.5261 9.50291 18.7884 9.24443C19.118 8.91852 19.5713 8.91852 19.8972 9.24443C20.7251 10.0611 21.5492 10.8815 22.3771 11.6981C22.6993 12.0165 22.7105 12.4698 22.3996 12.792C21.9238 13.2865 21.4443 13.7772 20.9686 14.2717C20.9648 14.2792 20.9536 14.2867 20.9499 14.2904Z"
-                        fill="white"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
           </div>
       </div>
       ))