diff --git a/apps/portal/src/components/offers/Breadcrumb.tsx b/apps/portal/src/components/offers/Breadcrumbs.tsx
similarity index 100%
rename from apps/portal/src/components/offers/Breadcrumb.tsx
rename to apps/portal/src/components/offers/Breadcrumbs.tsx
diff --git a/apps/portal/src/components/offers/EducationFields.ts b/apps/portal/src/components/offers/EducationFields.ts
new file mode 100644
index 00000000..6818b9ab
--- /dev/null
+++ b/apps/portal/src/components/offers/EducationFields.ts
@@ -0,0 +1,16 @@
+import { emptyOption } from './constants';
+
+export const EducationFieldLabels = [
+  'Business Analytics',
+  'Computer Science',
+  'Data Science and Analytics',
+  'Information Security',
+  'Information Systems',
+];
+
+export const EducationFieldOptions = [emptyOption].concat(
+  EducationFieldLabels.map((label) => ({
+    label,
+    value: label.replace(/\s+/g, '-').toLowerCase(),
+  })),
+);
diff --git a/apps/portal/src/components/offers/EducationLevels.ts b/apps/portal/src/components/offers/EducationLevels.ts
new file mode 100644
index 00000000..176b2519
--- /dev/null
+++ b/apps/portal/src/components/offers/EducationLevels.ts
@@ -0,0 +1,18 @@
+import { emptyOption } from './constants';
+
+export const EducationLevelLabels = [
+  'Bachelor',
+  'Diploma',
+  'Masters',
+  'PhD',
+  'Professional',
+  'Secondary',
+  'Self-taught',
+];
+
+export const EducationLevelOptions = [emptyOption].concat(
+  EducationLevelLabels.map((label) => ({
+    label,
+    value: label.replace(/\s+/g, '-').toLowerCase(),
+  })),
+);
diff --git a/apps/portal/src/components/offers/InternshipCycles.ts b/apps/portal/src/components/offers/InternshipCycles.ts
new file mode 100644
index 00000000..1f90539f
--- /dev/null
+++ b/apps/portal/src/components/offers/InternshipCycles.ts
@@ -0,0 +1,18 @@
+import { emptyOption } from './constants';
+
+export const InternshipCycleLabels = [
+  'Spring',
+  'Summer',
+  'Fall',
+  'Winter',
+  'Half year',
+  'Full year',
+  'Others',
+];
+
+export const InternshipCycleOptions = [emptyOption].concat(
+  InternshipCycleLabels.map((label) => ({
+    label,
+    value: label.replace(/\s+/g, '-').toLowerCase(),
+  })),
+);
diff --git a/apps/portal/src/components/offers/JobTypeTabs.tsx b/apps/portal/src/components/offers/JobTypeTabs.tsx
index 8ea87bc6..22d70ea7 100644
--- a/apps/portal/src/components/offers/JobTypeTabs.tsx
+++ b/apps/portal/src/components/offers/JobTypeTabs.tsx
@@ -1,7 +1,7 @@
 import clsx from 'clsx';
 import { JobType } from '@prisma/client';
 
-import { JobTypeLabel } from './types';
+import { JobTypeLabel } from '~/components/offers/constants';
 
 type Props = Readonly<{
   onChange: (jobType: JobType) => void;
diff --git a/apps/portal/src/components/offers/Years.ts b/apps/portal/src/components/offers/Years.ts
new file mode 100644
index 00000000..da9ab8e3
--- /dev/null
+++ b/apps/portal/src/components/offers/Years.ts
@@ -0,0 +1,8 @@
+const NUM_YEARS = 5;
+export const FutureYearsOptions = Array.from({ length: NUM_YEARS }, (_, i) => {
+  const year = new Date().getFullYear() + i;
+  return {
+    label: String(year),
+    value: year,
+  };
+});
diff --git a/apps/portal/src/components/offers/constants.ts b/apps/portal/src/components/offers/constants.ts
index d49dca1a..e84dfd4e 100644
--- a/apps/portal/src/components/offers/constants.ts
+++ b/apps/portal/src/components/offers/constants.ts
@@ -1,78 +1,14 @@
-import { EducationBackgroundType } from './types';
+export const HOME_URL = '/offers';
 
-export const emptyOption = '----';
+export const JobTypeLabel = {
+  FULLTIME: 'Full-time',
+  INTERN: 'Internship',
+};
 
-export const internshipCycleOptions = [
-  {
-    label: 'Summer',
-    value: 'Summer',
-  },
-  {
-    label: 'Winter',
-    value: 'Winter',
-  },
-  {
-    label: 'Spring',
-    value: 'Spring',
-  },
-  {
-    label: 'Fall',
-    value: 'Fall',
-  },
-  {
-    label: 'Full year',
-    value: 'Full year',
-  },
-];
-
-export const yearOptions = [
-  {
-    label: '2021',
-    value: 2021,
-  },
-  {
-    label: '2022',
-    value: 2022,
-  },
-  {
-    label: '2023',
-    value: 2023,
-  },
-  {
-    label: '2024',
-    value: 2024,
-  },
-];
-
-export const educationLevelOptions = Object.entries(
-  EducationBackgroundType,
-).map(([, value]) => ({
-  label: value,
-  value,
-}));
-
-export const educationFieldOptions = [
-  {
-    label: 'Computer Science',
-    value: 'Computer Science',
-  },
-  {
-    label: 'Information Security',
-    value: 'Information Security',
-  },
-  {
-    label: 'Information Systems',
-    value: 'Information Systems',
-  },
-  {
-    label: 'Business Analytics',
-    value: 'Business Analytics',
-  },
-  {
-    label: 'Data Science and Analytics',
-    value: 'Data Science and Analytics',
-  },
-];
+export const emptyOption = {
+  label: '',
+  value: '',
+};
 
 export enum FieldError {
   NON_NEGATIVE_NUMBER = 'Please fill in a non-negative number in this field.',
diff --git a/apps/portal/src/components/offers/dashboard/DashboardOfferCard.tsx b/apps/portal/src/components/offers/dashboard/DashboardOfferCard.tsx
index 722263b6..dda493ec 100644
--- a/apps/portal/src/components/offers/dashboard/DashboardOfferCard.tsx
+++ b/apps/portal/src/components/offers/dashboard/DashboardOfferCard.tsx
@@ -37,28 +37,28 @@ export default function DashboardProfileCard({
           </h4>
           <div className="mt-1 flex flex-col sm:mt-0 sm:flex-row sm:flex-wrap sm:space-x-4">
             {company?.name && (
-              <div className="mt-2 flex items-center text-sm text-gray-500">
+              <div className="mt-2 flex items-center text-sm text-slate-500">
                 <BuildingOfficeIcon
                   aria-hidden="true"
-                  className="mr-1.5 h-5 w-5 flex-shrink-0 text-gray-400"
+                  className="mr-1.5 h-5 w-5 flex-shrink-0 text-slate-400"
                 />
                 {company.name}
               </div>
             )}
             {location && (
-              <div className="mt-2 flex items-center text-sm text-gray-500">
+              <div className="mt-2 flex items-center text-sm text-slate-500">
                 <MapPinIcon
                   aria-hidden="true"
-                  className="mr-1.5 h-5 w-5 flex-shrink-0 text-gray-400"
+                  className="mr-1.5 h-5 w-5 flex-shrink-0 text-slate-400"
                 />
                 {location.cityName}
               </div>
             )}
             {level && (
-              <div className="mt-2 flex items-center text-sm text-gray-500">
+              <div className="mt-2 flex items-center text-sm text-slate-500">
                 <ArrowTrendingUpIcon
                   aria-hidden="true"
-                  className="mr-1.5 h-5 w-5 flex-shrink-0 text-gray-400"
+                  className="mr-1.5 h-5 w-5 flex-shrink-0 text-slate-400"
                 />
                 {level}
               </div>
diff --git a/apps/portal/src/components/offers/features/LeftTextCard.tsx b/apps/portal/src/components/offers/features/LeftTextCard.tsx
index b4fac765..867b24b7 100644
--- a/apps/portal/src/components/offers/features/LeftTextCard.tsx
+++ b/apps/portal/src/components/offers/features/LeftTextCard.tsx
@@ -2,7 +2,7 @@ import type { StaticImageData } from 'next/image';
 import Image from 'next/image';
 import type { ReactNode } from 'react';
 
-import { HOME_URL } from '~/components/offers/types';
+import { HOME_URL } from '../constants';
 
 type LeftTextCardProps = Readonly<{
   description: string;
diff --git a/apps/portal/src/components/offers/features/RightTextCard.tsx b/apps/portal/src/components/offers/features/RightTextCard.tsx
index 9ca0f949..028dc57b 100644
--- a/apps/portal/src/components/offers/features/RightTextCard.tsx
+++ b/apps/portal/src/components/offers/features/RightTextCard.tsx
@@ -2,7 +2,7 @@ import type { StaticImageData } from 'next/image';
 import Image from 'next/image';
 import type { ReactNode } from 'react';
 
-import { HOME_URL } from '~/components/offers/types';
+import { HOME_URL } from '../constants';
 
 type RightTextCarddProps = Readonly<{
   description: string;
diff --git a/apps/portal/src/components/offers/offerAnalysis/OfferProfileCard.tsx b/apps/portal/src/components/offers/offerAnalysis/OfferProfileCard.tsx
index bdf9a1b3..4c7ecca3 100644
--- a/apps/portal/src/components/offers/offerAnalysis/OfferProfileCard.tsx
+++ b/apps/portal/src/components/offers/offerAnalysis/OfferProfileCard.tsx
@@ -9,10 +9,11 @@ import { getLabelForJobTitleType } from '~/components/shared/JobTitles';
 
 import { HorizontalDivider } from '~/../../../packages/ui/dist';
 import { convertMoneyToString } from '~/utils/offers/currency';
+import { getCompanyDisplayText } from '~/utils/offers/string';
 import { formatDate } from '~/utils/offers/time';
 
+import { JobTypeLabel } from '../constants';
 import ProfilePhotoHolder from '../profile/ProfilePhotoHolder';
-import { JobTypeLabel } from '../types';
 
 import type { AnalysisOffer } from '~/types/offers';
 
@@ -69,7 +70,7 @@ export default function OfferProfileCard({
             {getLabelForJobTitleType(title as JobTitleType)}{' '}
             {`(${JobTypeLabel[jobType]})`}
           </p>
-          <p>{`Company: ${company.name}, ${location}`}</p>
+          <p>{`Company: ${getCompanyDisplayText(company.name, location)}`}</p>
           {level && <p>Level: {level}</p>}
         </div>
         <div className="col-span-1 row-span-3">
diff --git a/apps/portal/src/components/offers/offersSubmission/OffersProfileSave.tsx b/apps/portal/src/components/offers/offersSubmission/OffersProfileSave.tsx
index b72641d8..d494912e 100644
--- a/apps/portal/src/components/offers/offersSubmission/OffersProfileSave.tsx
+++ b/apps/portal/src/components/offers/offersSubmission/OffersProfileSave.tsx
@@ -93,7 +93,6 @@ export default function OffersProfileSave({
             <div className="mt-4 flex gap-4">
               <div className="grow">
                 <TextInput
-                  disabled={true}
                   isLabelHidden={true}
                   label="Edit link"
                   value={getProfileLink(profileId, token)}
diff --git a/apps/portal/src/components/offers/offersSubmission/OffersSubmissionForm.tsx b/apps/portal/src/components/offers/offersSubmission/OffersSubmissionForm.tsx
index 06415aad..42eff26c 100644
--- a/apps/portal/src/components/offers/offersSubmission/OffersSubmissionForm.tsx
+++ b/apps/portal/src/components/offers/offersSubmission/OffersSubmissionForm.tsx
@@ -4,11 +4,11 @@ import type { SubmitHandler } from 'react-hook-form';
 import { FormProvider, useForm } from 'react-hook-form';
 import { ArrowLeftIcon, ArrowRightIcon } from '@heroicons/react/20/solid';
 import { JobType } from '@prisma/client';
-import { Button } from '@tih/ui';
+import { Button, useToast } from '@tih/ui';
 
 import { useGoogleAnalytics } from '~/components/global/GoogleAnalytics';
-import type { BreadcrumbStep } from '~/components/offers/Breadcrumb';
-import { Breadcrumbs } from '~/components/offers/Breadcrumb';
+import type { BreadcrumbStep } from '~/components/offers/Breadcrumbs';
+import { Breadcrumbs } from '~/components/offers/Breadcrumbs';
 import BackgroundForm from '~/components/offers/offersSubmission/submissionForm/BackgroundForm';
 import OfferDetailsForm from '~/components/offers/offersSubmission/submissionForm/OfferDetailsForm';
 import type {
@@ -102,8 +102,9 @@ export default function OffersSubmissionForm({
     token: editToken,
   });
   const [isSubmitted, setIsSubmitted] = useState(false);
-  const { event: gaEvent } = useGoogleAnalytics();
 
+  const { event: gaEvent } = useGoogleAnalytics();
+  const { showToast } = useToast();
   const router = useRouter();
   const pageRef = useRef<HTMLDivElement>(null);
   const scrollToTop = () =>
@@ -132,13 +133,7 @@ export default function OffersSubmissionForm({
     },
   );
 
-  const steps = [
-    <OfferDetailsForm
-      key={0}
-      defaultJobType={initialOfferProfileValues.offers[0].jobType}
-    />,
-    <BackgroundForm key={1} />,
-  ];
+  const steps = [<OfferDetailsForm key={0} />, <BackgroundForm key={1} />];
 
   const breadcrumbSteps: Array<BreadcrumbStep> = [
     {
@@ -157,14 +152,14 @@ export default function OffersSubmissionForm({
     },
   ];
 
-  const goToNextStep = async (currStep: number) => {
-    if (currStep === 0) {
+  const setStepWithValidation = async (nextStep: number) => {
+    if (nextStep === 1) {
       const result = await trigger('offers');
       if (!result) {
         return;
       }
     }
-    setStep(step + 1);
+    setStep(nextStep);
   };
 
   const mutationpath =
@@ -175,10 +170,24 @@ export default function OffersSubmissionForm({
   const createOrUpdateMutation = trpc.useMutation([mutationpath], {
     onError(error) {
       console.error(error.message);
+      showToast({
+        title:
+          editProfileId && editToken
+            ? 'Error updating offer profile.'
+            : 'Error creating offer profile',
+        variant: 'failure',
+      });
     },
     onSuccess(data) {
       setParams({ profileId: data.id, token: data.token });
       setIsSubmitted(true);
+      showToast({
+        title:
+          editProfileId && editToken
+            ? 'Offer profile updated successfully!'
+            : 'Offer profile created successfully!',
+        variant: 'success',
+      });
     },
   });
 
@@ -270,7 +279,7 @@ export default function OffersSubmissionForm({
           <div className="flex justify-center bg-slate-100 px-4 py-4 sm:px-6 lg:px-8">
             <Breadcrumbs
               currentStep={step}
-              setStep={setStep}
+              setStep={setStepWithValidation}
               steps={breadcrumbSteps}
             />
           </div>
@@ -288,7 +297,7 @@ export default function OffersSubmissionForm({
                       label="Next"
                       variant="primary"
                       onClick={() => {
-                        goToNextStep(step);
+                        setStepWithValidation(step + 1);
                         gaEvent({
                           action: 'offers.profile_submission_navigate_next',
                           category: 'submission',
diff --git a/apps/portal/src/components/offers/offersSubmission/submissionForm/BackgroundForm.tsx b/apps/portal/src/components/offers/offersSubmission/submissionForm/BackgroundForm.tsx
index bfe5ee5f..d951f088 100644
--- a/apps/portal/src/components/offers/offersSubmission/submissionForm/BackgroundForm.tsx
+++ b/apps/portal/src/components/offers/offersSubmission/submissionForm/BackgroundForm.tsx
@@ -2,12 +2,7 @@ import { useFormContext, useWatch } from 'react-hook-form';
 import { JobType } from '@prisma/client';
 import { Collapsible, RadioList } from '@tih/ui';
 
-import {
-  educationFieldOptions,
-  educationLevelOptions,
-  emptyOption,
-  FieldError,
-} from '~/components/offers/constants';
+import { FieldError } from '~/components/offers/constants';
 import type { BackgroundPostData } from '~/components/offers/types';
 import CitiesTypeahead from '~/components/shared/CitiesTypeahead';
 import CompaniesTypeahead from '~/components/shared/CompaniesTypeahead';
@@ -20,6 +15,8 @@ import {
   CURRENCY_OPTIONS,
 } from '~/utils/offers/currency/CurrencyEnum';
 
+import { EducationFieldOptions } from '../../EducationFields';
+import { EducationLevelOptions } from '../../EducationLevels';
 import FormRadioList from '../../forms/FormRadioList';
 import FormSection from '../../forms/FormSection';
 import FormSelect from '../../forms/FormSelect';
@@ -134,6 +131,9 @@ function FullTimeJobFields() {
             if (option) {
               setValue('background.experiences.0.companyId', option.value);
               setValue('background.experiences.0.companyName', option.label);
+            } else {
+              setValue('background.experiences.0.companyId', '');
+              setValue('background.experiences.0.companyName', '');
             }
           }}
         />
@@ -343,15 +343,13 @@ function EducationSection() {
         <FormSelect
           display="block"
           label="Education Level"
-          options={educationLevelOptions}
-          placeholder={emptyOption}
+          options={EducationLevelOptions}
           {...register(`background.educations.0.type`)}
         />
         <FormSelect
           display="block"
           label="Field"
-          options={educationFieldOptions}
-          placeholder={emptyOption}
+          options={EducationFieldOptions}
           {...register(`background.educations.0.field`)}
         />
       </div>
diff --git a/apps/portal/src/components/offers/offersSubmission/submissionForm/OfferDetailsForm.tsx b/apps/portal/src/components/offers/offersSubmission/submissionForm/OfferDetailsForm.tsx
index 7c9e52e6..1fc38fe2 100644
--- a/apps/portal/src/components/offers/offersSubmission/submissionForm/OfferDetailsForm.tsx
+++ b/apps/portal/src/components/offers/offersSubmission/submissionForm/OfferDetailsForm.tsx
@@ -22,20 +22,16 @@ import {
   defaultFullTimeOfferValues,
   defaultInternshipOfferValues,
 } from '../OffersSubmissionForm';
-import {
-  emptyOption,
-  FieldError,
-  internshipCycleOptions,
-  yearOptions,
-} from '../../constants';
+import { FieldError, JobTypeLabel } from '../../constants';
 import FormMonthYearPicker from '../../forms/FormMonthYearPicker';
 import FormSection from '../../forms/FormSection';
 import FormSelect from '../../forms/FormSelect';
 import FormTextArea from '../../forms/FormTextArea';
 import FormTextInput from '../../forms/FormTextInput';
+import { InternshipCycleOptions } from '../../InternshipCycles';
 import JobTypeTabs from '../../JobTypeTabs';
 import type { OfferFormData } from '../../types';
-import { JobTypeLabel } from '../../types';
+import { FutureYearsOptions } from '../../Years';
 import {
   Currency,
   CURRENCY_OPTIONS,
@@ -384,8 +380,7 @@ function InternshipOfferDetailsForm({
             display="block"
             errorMessage={offerFields?.offersIntern?.internshipCycle?.message}
             label="Internship Cycle"
-            options={internshipCycleOptions}
-            placeholder={emptyOption}
+            options={InternshipCycleOptions}
             required={true}
             {...register(`offers.${index}.offersIntern.internshipCycle`, {
               required: FieldError.REQUIRED,
@@ -395,8 +390,7 @@ function InternshipOfferDetailsForm({
             display="block"
             errorMessage={offerFields?.offersIntern?.startYear?.message}
             label="Internship Year"
-            options={yearOptions}
-            placeholder={emptyOption}
+            options={FutureYearsOptions}
             required={true}
             {...register(`offers.${index}.offersIntern.startYear`, {
               required: FieldError.REQUIRED,
@@ -522,14 +516,11 @@ function OfferDetailsFormArray({
   );
 }
 
-type OfferDetailsFormProps = Readonly<{
-  defaultJobType?: JobType;
-}>;
-
-export default function OfferDetailsForm({
-  defaultJobType = JobType.FULLTIME,
-}: OfferDetailsFormProps) {
-  const [jobType, setJobType] = useState(defaultJobType);
+export default function OfferDetailsForm() {
+  const watchJobType = useWatch({
+    name: `offers.0.jobType`,
+  });
+  const [jobType, setJobType] = useState(watchJobType as JobType);
   const [isDialogOpen, setDialogOpen] = useState(false);
   const { control } = useFormContext();
   const fieldArrayValues = useFieldArray({ control, name: 'offers' });
@@ -576,8 +567,8 @@ export default function OfferDetailsForm({
             label="Switch"
             variant="primary"
             onClick={() => {
-              toggleJobType();
               setDialogOpen(false);
+              toggleJobType();
             }}
           />
         }
diff --git a/apps/portal/src/components/offers/profile/EducationCard.tsx b/apps/portal/src/components/offers/profile/EducationCard.tsx
index c885ef5a..9549e423 100644
--- a/apps/portal/src/components/offers/profile/EducationCard.tsx
+++ b/apps/portal/src/components/offers/profile/EducationCard.tsx
@@ -13,12 +13,12 @@ export default function EducationCard({
   education: { type, field, startDate, endDate, school },
 }: Props) {
   return (
-    <div className="mx-8 my-4 block rounded-lg bg-white py-4 shadow-md">
-      <div className="flex justify-between px-8">
-        <div className="flex flex-col">
-          <div className="flex flex-row">
+    <div className="block rounded-lg border border-slate-200 bg-white p-4 text-sm ">
+      <div className="flex justify-between">
+        <div>
+          <div className="flex items-center">
             <LightBulbIcon className="mr-1 h-5" />
-            <span className="ml-1 font-bold">
+            <span className="text-semibold ml-1">
               {field ? `${type ?? 'N/A'}, ${field}` : type ?? `N/A`}
             </span>
           </div>
diff --git a/apps/portal/src/components/offers/profile/OfferCard.tsx b/apps/portal/src/components/offers/profile/OfferCard.tsx
index 3d03e1ef..68f1571a 100644
--- a/apps/portal/src/components/offers/profile/OfferCard.tsx
+++ b/apps/portal/src/components/offers/profile/OfferCard.tsx
@@ -1,13 +1,13 @@
 import {
-  BuildingOffice2Icon,
-  ChatBubbleBottomCenterTextIcon,
-  CurrencyDollarIcon,
-  ScaleIcon,
-} from '@heroicons/react/24/outline';
-import { HorizontalDivider } from '@tih/ui';
+  ArrowTrendingUpIcon,
+  BuildingOfficeIcon,
+  MapPinIcon,
+} from '@heroicons/react/20/solid';
 
+import { JobTypeLabel } from '~/components/offers/constants';
 import type { OfferDisplayData } from '~/components/offers/types';
-import { JobTypeLabel } from '~/components/offers/types';
+
+import { getLocationDisplayText } from '~/utils/offers/string';
 
 type Props = Readonly<{
   offer: OfferDisplayData;
@@ -33,33 +33,55 @@ export default function OfferCard({
 }: Props) {
   function UpperSection() {
     return (
-      <div className="flex justify-between px-8">
-        <div className="flex flex-col">
-          <div className="flex flex-row">
-            <span>
-              <BuildingOffice2Icon className="mr-3 h-5" />
-            </span>
-            <span className="font-bold">
-              {location ? `${companyName}, ${location.cityName}` : companyName}
-            </span>
+      <div className="px-4 py-5 sm:px-6">
+        <div className="flex justify-between">
+          <div>
+            <h3 className="text-lg font-medium leading-6 text-slate-900">
+              {jobTitle} {jobType && <>({JobTypeLabel[jobType]})</>}
+            </h3>
+            <div className="mt-1 flex flex-row flex-wrap space-x-4 sm:mt-0">
+              {companyName && (
+                <div className="mt-2 flex items-center text-sm text-slate-500">
+                  <BuildingOfficeIcon
+                    aria-hidden="true"
+                    className="mr-1.5 h-5 w-5 flex-shrink-0 text-slate-400"
+                  />
+                  {companyName}
+                </div>
+              )}
+              {location && (
+                <div className="mt-2 flex items-center text-sm text-slate-500">
+                  <MapPinIcon
+                    aria-hidden="true"
+                    className="mr-1.5 h-5 w-5 flex-shrink-0 text-slate-400"
+                  />
+                  {getLocationDisplayText(location)}
+                </div>
+              )}
+              {jobLevel && (
+                <div className="mt-2 flex items-center text-sm text-slate-500">
+                  <ArrowTrendingUpIcon
+                    aria-hidden="true"
+                    className="mr-1.5 h-5 w-5 flex-shrink-0 text-slate-400"
+                  />
+                  {jobLevel}
+                </div>
+              )}
+            </div>
           </div>
-          <div className="ml-8 flex flex-row">
-            <p>
-              {jobLevel ? `${jobTitle}, ${jobLevel}` : jobTitle}{' '}
-              {jobType && `(${JobTypeLabel[jobType]})`}
-            </p>
+          <div className="space-y-2">
+            {!duration && receivedMonth && (
+              <div className="text-sm text-slate-500">
+                <p>{receivedMonth}</p>
+              </div>
+            )}
+            {duration && (
+              <div className="text-sm text-slate-500">
+                <p>{`${duration} months`}</p>
+              </div>
+            )}
           </div>
         </div>
-        {!duration && receivedMonth && (
-          <div className="font-light text-slate-400">
-            <p>{receivedMonth}</p>
-          </div>
-        )}
-        {duration && (
-          <div className="font-light text-slate-400">
-            <p>{`${duration} months`}</p>
-          </div>
-        )}
       </div>
     );
   }
@@ -75,60 +97,69 @@ export default function OfferCard({
     }
 
     return (
-      <>
-        <HorizontalDivider />
-        <div className="px-8">
-          <div className="flex flex-col py-2">
-            {(totalCompensation || monthlySalary) && (
-              <div className="flex flex-row">
-                <span>
-                  <CurrencyDollarIcon className="mr-3 h-5" />
-                </span>
-                <span>
-                  <p>
-                    {totalCompensation && `TC: ${totalCompensation}`}
-                    {monthlySalary && `Monthly Salary: ${monthlySalary}`}
-                  </p>
-                </span>
-              </div>
-            )}
-            {(base || stocks || bonus) && totalCompensation && (
-              <div className="ml-8 flex flex-row font-light">
-                <p>
-                  Base / year: {base ?? 'N/A'} ⋅ Stocks / year:{' '}
-                  {stocks ?? 'N/A'} ⋅ Bonus / year: {bonus ?? 'N/A'}
-                </p>
-              </div>
-            )}
-          </div>
+      <div className="border-t border-slate-200 px-4 py-5 sm:px-6">
+        <dl className="grid grid-cols-2 gap-x-4 gap-y-8 sm:grid-cols-4">
+          {totalCompensation && (
+            <div className="col-span-1">
+              <dt className="text-sm font-medium text-slate-500">
+                Total Compensation
+              </dt>
+              <dd className="mt-1 text-sm text-slate-900">
+                {totalCompensation}
+              </dd>
+            </div>
+          )}
+          {monthlySalary && (
+            <div className="col-span-1">
+              <dt className="text-sm font-medium text-slate-500">
+                Monthly Salary
+              </dt>
+              <dd className="mt-1 text-sm text-slate-900">{monthlySalary}</dd>
+            </div>
+          )}
+          {base && (
+            <div className="col-span-1">
+              <dt className="text-sm font-medium text-slate-500">
+                Base Salary
+              </dt>
+              <dd className="mt-1 text-sm text-slate-900">{base}</dd>
+            </div>
+          )}
+          {stocks && (
+            <div className="col-span-1">
+              <dt className="text-sm font-medium text-slate-500">Stocks</dt>
+              <dd className="mt-1 text-sm text-slate-900">{stocks}</dd>
+            </div>
+          )}
+          {bonus && (
+            <div className="col-span-1">
+              <dt className="text-sm font-medium text-slate-500">Bonus</dt>
+              <dd className="mt-1 text-sm text-slate-900">{bonus}</dd>
+            </div>
+          )}
           {negotiationStrategy && (
-            <div className="flex flex-col py-2">
-              <div className="flex flex-row">
-                <span>
-                  <ScaleIcon className="h-5 w-5" />
-                </span>
-                <span className="overflow-wrap ml-2">
-                  "{negotiationStrategy}"
-                </span>
-              </div>
+            <div className="col-span-2">
+              <dt className="text-sm font-medium text-slate-500">
+                Negotiation Strategy
+              </dt>
+              <dd className="mt-1 text-sm text-slate-900">
+                {negotiationStrategy}
+              </dd>
             </div>
           )}
           {otherComment && (
-            <div className="flex flex-col py-2">
-              <div className="flex flex-row">
-                <span>
-                  <ChatBubbleBottomCenterTextIcon className="h-5 w-5" />
-                </span>
-                <span className="overflow-wrap ml-2">"{otherComment}"</span>
-              </div>
+            <div className="col-span-2">
+              <dt className="text-sm font-medium text-slate-500">Others</dt>
+              <dd className="mt-1 text-sm text-slate-900">{otherComment}</dd>
             </div>
           )}
-        </div>
-      </>
+        </dl>
+      </div>
     );
   }
+
   return (
-    <div className="mx-8 my-4 block rounded-md border-b border-gray-300 bg-white py-4">
+    <div className="block rounded-lg border border-slate-200 bg-white">
       <UpperSection />
       <BottomSection />
     </div>
diff --git a/apps/portal/src/components/offers/profile/ProfileComments.tsx b/apps/portal/src/components/offers/profile/ProfileComments.tsx
index dc0ec114..34ac8b67 100644
--- a/apps/portal/src/components/offers/profile/ProfileComments.tsx
+++ b/apps/portal/src/components/offers/profile/ProfileComments.tsx
@@ -110,10 +110,10 @@ export default function ProfileComments({
     );
   }
   return (
-    <div className="bh-white h-fit px-4 lg:h-[calc(100vh-4.5rem)] lg:overflow-y-auto">
-      <div className="bg-white pt-4 lg:sticky lg:top-0">
+    <div className="bh-white h-fit p-4 lg:h-[calc(100vh-4.5rem)] lg:overflow-y-auto">
+      <div className="bg-white lg:sticky lg:top-0">
         <div className="flex justify-end">
-          <div className="grid w-fit space-y-2 lg:grid-cols-1 lg:grid-cols-2 lg:space-y-0 lg:space-x-4">
+          <div className="grid w-fit grid-cols-1 space-y-2 md:grid-cols-2 md:space-y-0 md:space-x-4">
             <div className="col-span-1 flex justify-end">
               {isEditable && (
                 <Tooltip tooltipContent="Copy this link to edit your profile later">
@@ -169,57 +169,62 @@ export default function ProfileComments({
           </div>
         </div>
 
-        <h2 className="mt-2 mb-6 text-2xl font-bold">Discussions</h2>
-        {isEditable || session?.user?.name ? (
-          <div>
-            <TextArea
-              label={`Comment as ${
-                isEditable ? profileName : session?.user?.name ?? 'anonymous'
-              }`}
-              placeholder="Type your comment here"
-              value={currentReply}
-              onChange={(value) => setCurrentReply(value)}
-            />
-            <div className="mt-2 flex w-full justify-end">
-              <div className="w-fit">
-                <Button
-                  disabled={
-                    commentsQuery.isLoading ||
-                    !currentReply.length ||
-                    createCommentMutation.isLoading
-                  }
-                  display="block"
-                  isLabelHidden={false}
-                  isLoading={createCommentMutation.isLoading}
-                  label="Comment"
-                  size="sm"
-                  variant="primary"
-                  onClick={() => handleComment(currentReply)}
-                />
+        <div className="mt-2 mb-6 bg-white">
+          <h2 className="text-2xl font-bold">Discussions</h2>
+          {isEditable || session?.user?.name ? (
+            <div>
+              <TextArea
+                label={`Comment as ${
+                  isEditable ? profileName : session?.user?.name ?? 'anonymous'
+                }`}
+                placeholder="Type your comment here"
+                value={currentReply}
+                onChange={(value) => setCurrentReply(value)}
+              />
+              <div className="mt-2 flex w-full justify-end">
+                <div className="w-fit">
+                  <Button
+                    disabled={
+                      commentsQuery.isLoading ||
+                      !currentReply.length ||
+                      createCommentMutation.isLoading
+                    }
+                    display="block"
+                    isLabelHidden={false}
+                    isLoading={createCommentMutation.isLoading}
+                    label="Comment"
+                    size="sm"
+                    variant="primary"
+                    onClick={() => handleComment(currentReply)}
+                  />
+                </div>
               </div>
+              <HorizontalDivider />
             </div>
-            <HorizontalDivider />
-          </div>
-        ) : (
-          <Button
-            className="mb-5"
-            display="block"
-            href={loginPageHref()}
-            label="Sign in to join discussion"
-            variant="tertiary"
-          />
-        )}
-      </div>
-      <div className="w-full">
-        {replies?.map((reply: Reply) => (
-          <ExpandableCommentCard
-            key={reply.id}
-            comment={reply}
-            profileId={profileId}
-            token={isEditable ? token : undefined}
-          />
-        ))}
+          ) : (
+            <Button
+              className="mb-5"
+              display="block"
+              href={loginPageHref()}
+              label="Sign in to join discussion"
+              variant="tertiary"
+            />
+          )}
+        </div>
       </div>
+      <section className="w-full">
+        <ul className="space-y-8" role="list">
+          {replies?.map((reply: Reply) => (
+            <li key={reply.id}>
+              <ExpandableCommentCard
+                comment={reply}
+                profileId={profileId}
+                token={isEditable ? token : undefined}
+              />
+            </li>
+          ))}
+        </ul>
+      </section>
     </div>
   );
 }
diff --git a/apps/portal/src/components/offers/profile/ProfileDetails.tsx b/apps/portal/src/components/offers/profile/ProfileDetails.tsx
index 3f61060b..7bc5d10c 100644
--- a/apps/portal/src/components/offers/profile/ProfileDetails.tsx
+++ b/apps/portal/src/components/offers/profile/ProfileDetails.tsx
@@ -25,19 +25,19 @@ type ProfileOffersProps = Readonly<{
 }>;
 
 function ProfileOffers({ offers }: ProfileOffersProps) {
-  if (offers.length !== 0) {
+  if (offers.length === 0) {
     return (
-      <>
-        {offers.map((offer) => (
-          <OfferCard key={offer.id} offer={offer} />
-        ))}
-      </>
+      <div className="p-4">
+        <p className="font-semibold">No offers are attached.</p>
+      </div>
     );
   }
+
   return (
-    <div className="mx-8 my-4 flex flex-row">
-      <BriefcaseIcon className="mr-1 h-5" />
-      <span className="font-bold">No offer is attached.</span>
+    <div className="space-y-4 p-4">
+      {offers.map((offer) => (
+        <OfferCard key={offer.id} offer={offer} />
+      ))}
     </div>
   );
 }
@@ -49,33 +49,37 @@ type ProfileBackgroundProps = Readonly<{
 function ProfileBackground({ background }: ProfileBackgroundProps) {
   if (!background?.experiences?.length && !background?.educations?.length) {
     return (
-      <div className="mx-8 my-4">
+      <div className="p-4">
         <p>No background information available.</p>
       </div>
     );
   }
 
   return (
-    <>
+    <div className="space-y-8 p-4">
       {background?.experiences?.length > 0 && (
-        <>
-          <div className="mx-8 my-4 flex flex-row">
-            <BriefcaseIcon className="mr-1 h-5" />
-            <span className="font-bold">Work Experience</span>
+        <div className="space-y-2">
+          <div className="flex items-center space-x-2 text-slate-500">
+            <BriefcaseIcon className="h-5" />
+            <h3 className="text-sm font-semibold uppercase tracking-wide">
+              Work Experience
+            </h3>
           </div>
           <OfferCard offer={background.experiences[0]} />
-        </>
+        </div>
       )}
       {background?.educations?.length > 0 && (
-        <>
-          <div className="mx-8 my-4 flex flex-row">
-            <AcademicCapIcon className="mr-1 h-5" />
-            <span className="font-bold">Education</span>
+        <div className="space-y-2">
+          <div className="flex items-center space-x-2 text-slate-500">
+            <AcademicCapIcon className="h-5" />
+            <h3 className="text-sm font-semibold uppercase tracking-wide">
+              Education
+            </h3>
           </div>
           <EducationCard education={background.educations[0]} />
-        </>
+        </div>
       )}
-    </>
+    </div>
   );
 }
 
@@ -114,7 +118,7 @@ function ProfileAnalysis({
   }
 
   return (
-    <div className="mx-8 my-4">
+    <div className="p-4">
       {!analysis ? (
         <p>No analysis available.</p>
       ) : (
@@ -165,12 +169,15 @@ export default function ProfileDetails({
       </div>
     );
   }
+
   if (selectedTab === ProfileDetailTab.OFFERS) {
     return <ProfileOffers offers={offers} />;
   }
+
   if (selectedTab === ProfileDetailTab.BACKGROUND) {
     return <ProfileBackground background={background} />;
   }
+
   if (selectedTab === ProfileDetailTab.ANALYSIS) {
     return (
       <ProfileAnalysis
diff --git a/apps/portal/src/components/offers/profile/ProfileHeader.tsx b/apps/portal/src/components/offers/profile/ProfileHeader.tsx
index 9a2923be..5a16cb96 100644
--- a/apps/portal/src/components/offers/profile/ProfileHeader.tsx
+++ b/apps/portal/src/components/offers/profile/ProfileHeader.tsx
@@ -13,10 +13,10 @@ import { Button, Dialog, Spinner, Tabs, useToast } from '@tih/ui';
 
 import { useGoogleAnalytics } from '~/components/global/GoogleAnalytics';
 import type { ProfileDetailTab } from '~/components/offers/constants';
+import { JobTypeLabel } from '~/components/offers/constants';
 import { profileDetailTabs } from '~/components/offers/constants';
 import ProfilePhotoHolder from '~/components/offers/profile/ProfilePhotoHolder';
 import type { BackgroundDisplayData } from '~/components/offers/types';
-import { JobTypeLabel } from '~/components/offers/types';
 import Tooltip from '~/components/offers/util/Tooltip';
 
 import { getProfileEditPath } from '~/utils/offers/link';
@@ -233,20 +233,20 @@ export default function ProfileHeader({
   const { experiences, totalYoe, specificYoes, profileName } = background;
 
   return (
-    <div className="grid-rows-2 bg-white p-4">
-      <div className="flex grid grid-cols-5 md:grid-cols-7">
-        <div className="jsutify-start col-span-5 flex">
-          <div className="ml-0 mr-2 mt-2 h-16 w-16 md:mx-4">
+    <div className="grid-rows-2 bg-white">
+      <div className="grid grid-cols-5 p-4 md:grid-cols-7">
+        <div className="col-span-5 flex justify-start space-x-4">
+          <div className="mt-2 h-16 w-16">
             <ProfilePhotoHolder />
           </div>
-          <div>
+          <div className="space-y-1">
             <h2 className="flex text-2xl font-bold">
               {profileName ?? 'anonymous'}
             </h2>
             {(experiences[0]?.companyName ||
               experiences[0]?.jobLevel ||
               experiences[0]?.jobTitle) && (
-              <div className="flex flex-row">
+              <div className="flex items-center text-sm text-slate-600">
                 <span>
                   <BuildingOffice2Icon className="mr-2.5 h-5 w-5" />
                 </span>
@@ -262,7 +262,7 @@ export default function ProfileHeader({
                 </p>
               </div>
             )}
-            <div className="flex flex-row">
+            <div className="flex items-center text-sm text-slate-600">
               <CalendarDaysIcon className="mr-2.5 h-5" />
               <p>
                 <span className="mr-2 font-bold">YOE:</span>
@@ -286,7 +286,7 @@ export default function ProfileHeader({
           </div>
         )}
       </div>
-      <div className="mt-4">
+      <div className="border-t border-slate-200 p-4">
         <Tabs
           label="Profile Detail Navigation"
           tabs={profileDetailTabs}
diff --git a/apps/portal/src/components/offers/profile/comments/CommentCard.tsx b/apps/portal/src/components/offers/profile/comments/CommentCard.tsx
index c94d7b5a..9f0a0bef 100644
--- a/apps/portal/src/components/offers/profile/comments/CommentCard.tsx
+++ b/apps/portal/src/components/offers/profile/comments/CommentCard.tsx
@@ -1,14 +1,9 @@
 import { signIn, useSession } from 'next-auth/react';
 import { useState } from 'react';
-import {
-  ChatBubbleBottomCenterIcon,
-  TrashIcon,
-} from '@heroicons/react/24/outline';
-import { Button, Dialog, HorizontalDivider, TextArea, useToast } from '@tih/ui';
+import { Button, Dialog, TextArea, useToast } from '@tih/ui';
 
 import { timeSinceNow } from '~/utils/offers/time';
-
-import { trpc } from '../../../../utils/trpc';
+import { trpc } from '~/utils/trpc';
 
 import type { Reply } from '~/types/offers';
 
@@ -125,80 +120,97 @@ export default function CommentCard({
   }
 
   return (
-    <>
-      <div className="flex pl-2">
-        <div className="flex w-full flex-col">
-          <div className="flex flex-row font-bold">
+    <div className="flex space-x-3">
+      {/* <div className="flex-shrink-0">
+        <img
+          alt=""
+          className="h-10 w-10 rounded-full"
+          src={`https://images.unsplash.com/photo-${comment.imageId}?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80`}
+        />
+      </div> */}
+      <div>
+        <div className="text-sm">
+          <p className="font-medium text-slate-900">
             {user?.name ?? 'unknown user'}
-          </div>
-          <div className="mt-2 mb-2 flex flex-row ">{message}</div>
-          <div className="flex flex-row items-center justify-start space-x-4 ">
-            <div className="flex flex-col text-sm font-light text-slate-400">{`${timeSinceNow(
-              createdAt,
-            )} ago`}</div>
-            {replyLength > 0 && (
-              <div
-                className="text-primary-600 flex cursor-pointer flex-col text-sm hover:underline"
+          </p>
+        </div>
+        <div className="mt-1 text-sm text-slate-700">
+          <p className="break-all">{message}</p>
+        </div>
+        <div className="mt-2 space-x-2 text-sm">
+          <span className="font-medium text-slate-500">
+            {timeSinceNow(createdAt)} ago
+          </span>{' '}
+          <span className="font-medium text-slate-500">&middot;</span>{' '}
+          {replyLength > 0 && (
+            <>
+              <button
+                className="font-medium text-slate-900"
+                type="button"
                 onClick={handleExpanded}>
                 {isExpanded ? `Hide replies` : `View replies (${replyLength})`}
-              </div>
-            )}
-            {!disableReply && (
-              <div className="flex flex-col">
-                <Button
-                  icon={ChatBubbleBottomCenterIcon}
-                  isLabelHidden={true}
-                  label="Reply"
-                  size="sm"
-                  variant="tertiary"
-                  onClick={() => setIsReplying(!isReplying)}
-                />
-              </div>
-            )}
-            {deletable && (
-              <>
-                <Button
-                  disabled={deleteCommentMutation.isLoading}
-                  icon={TrashIcon}
-                  isLabelHidden={true}
-                  isLoading={deleteCommentMutation.isLoading}
-                  label="Delete"
-                  size="sm"
-                  variant="tertiary"
-                  onClick={() => setIsDialogOpen(true)}
-                />
-                {isDialogOpen && (
-                  <Dialog
-                    isShown={isDialogOpen}
-                    primaryButton={
-                      <Button
-                        display="block"
-                        label="Delete"
-                        variant="primary"
-                        onClick={() => {
-                          setIsDialogOpen(false);
-                          handleDelete();
-                        }}
-                      />
-                    }
-                    secondaryButton={
-                      <Button
-                        display="block"
-                        label="Cancel"
-                        variant="tertiary"
-                        onClick={() => setIsDialogOpen(false)}
-                      />
-                    }
-                    title="Are you sure you want to delete this comment?"
-                    onClose={() => setIsDialogOpen(false)}>
-                    <div>You cannot undo this operation.</div>
-                  </Dialog>
-                )}
-              </>
-            )}
-          </div>
-          {!disableReply && isReplying && (
-            <div className="mt-2 mr-2">
+              </button>
+              <span className="font-medium text-slate-500">&middot;</span>{' '}
+            </>
+          )}
+          {!disableReply && (
+            <>
+              <button
+                className="font-medium text-slate-900"
+                type="button"
+                onClick={() => setIsReplying(!isReplying)}>
+                Reply
+              </button>
+              <span className="font-medium text-slate-500">&middot;</span>{' '}
+            </>
+          )}
+          {deletable && (
+            <>
+              <button
+                className="font-medium text-slate-900"
+                disabled={deleteCommentMutation.isLoading}
+                type="button"
+                onClick={() => setIsDialogOpen(true)}>
+                {deleteCommentMutation.isLoading ? 'Deleting...' : 'Delete'}
+              </button>
+              {isDialogOpen && (
+                <Dialog
+                  isShown={isDialogOpen}
+                  primaryButton={
+                    <Button
+                      display="block"
+                      label="Delete"
+                      variant="primary"
+                      onClick={() => {
+                        setIsDialogOpen(false);
+                        handleDelete();
+                      }}
+                    />
+                  }
+                  secondaryButton={
+                    <Button
+                      display="block"
+                      label="Cancel"
+                      variant="tertiary"
+                      onClick={() => setIsDialogOpen(false)}
+                    />
+                  }
+                  title="Are you sure you want to delete this comment?"
+                  onClose={() => setIsDialogOpen(false)}>
+                  <div>You cannot undo this operation.</div>
+                </Dialog>
+              )}
+            </>
+          )}
+        </div>
+        {!disableReply && isReplying && (
+          <div className="mt-2 mr-2">
+            <form
+              onSubmit={(event) => {
+                event.preventDefault();
+                event.stopPropagation();
+                handleReply();
+              }}>
               <TextArea
                 isLabelHidden={true}
                 label="Comment"
@@ -225,11 +237,10 @@ export default function CommentCard({
                   />
                 </div>
               </div>
-            </div>
-          )}
-        </div>
+            </form>
+          </div>
+        )}
       </div>
-      <HorizontalDivider />
-    </>
+    </div>
   );
 }
diff --git a/apps/portal/src/components/offers/profile/comments/ExpandableCommentCard.tsx b/apps/portal/src/components/offers/profile/comments/ExpandableCommentCard.tsx
index 22736196..0eb2d96c 100644
--- a/apps/portal/src/components/offers/profile/comments/ExpandableCommentCard.tsx
+++ b/apps/portal/src/components/offers/profile/comments/ExpandableCommentCard.tsx
@@ -26,18 +26,22 @@ export default function ExpandableCommentCard({
         replyLength={comment.replies?.length ?? 0}
         token={token}
       />
-      {comment.replies && (
-        <div className="pl-8">
-          {isExpanded &&
-            comment.replies.map((reply) => (
-              <CommentCard
-                key={reply.id}
-                comment={reply}
-                disableReply={true}
-                profileId={profileId}
-                token={token}
-              />
-            ))}
+      {comment.replies && comment.replies.length > 0 && isExpanded && (
+        <div className="pt-4">
+          <div className="border-l-4 border-slate-200 pl-4">
+            <ul className="space-y-4" role="list">
+              {comment.replies.map((reply) => (
+                <li key={reply.id}>
+                  <CommentCard
+                    comment={reply}
+                    disableReply={true}
+                    profileId={profileId}
+                    token={token}
+                  />
+                </li>
+              ))}
+            </ul>
+          </div>
         </div>
       )}
     </div>
diff --git a/apps/portal/src/components/offers/table/OffersRow.tsx b/apps/portal/src/components/offers/table/OffersRow.tsx
index 77c7ab44..f80802e4 100644
--- a/apps/portal/src/components/offers/table/OffersRow.tsx
+++ b/apps/portal/src/components/offers/table/OffersRow.tsx
@@ -42,9 +42,9 @@ export default function OfferTableRow({
       <td className="py-4 px-4">{convertMoneyToString(income)}</td>
       {jobType === JobType.FULLTIME && (
         <td className="py-4 px-4">
-          {`${baseSalary && convertMoneyToString(baseSalary)} / ${
-            bonus && convertMoneyToString(bonus)
-          } / ${stocks && convertMoneyToString(stocks)}`}
+          {`${convertMoneyToString(baseSalary)} / ${convertMoneyToString(
+            bonus,
+          )} / ${convertMoneyToString(stocks)}`}
         </td>
       )}
       <td className="py-4 px-4">{formatDate(monthYearReceived)}</td>
diff --git a/apps/portal/src/components/offers/table/OffersTable.tsx b/apps/portal/src/components/offers/table/OffersTable.tsx
index 534cd783..b530466b 100644
--- a/apps/portal/src/components/offers/table/OffersTable.tsx
+++ b/apps/portal/src/components/offers/table/OffersTable.tsx
@@ -2,7 +2,7 @@ import clsx from 'clsx';
 import { useRouter } from 'next/router';
 import { useEffect, useState } from 'react';
 import { JobType } from '@prisma/client';
-import { DropdownMenu, Spinner } from '@tih/ui';
+import { DropdownMenu, Spinner, useToast } from '@tih/ui';
 
 import { useGoogleAnalytics } from '~/components/global/GoogleAnalytics';
 import OffersTablePagination from '~/components/offers/table/OffersTablePagination';
@@ -66,6 +66,7 @@ export default function OffersTable({
     event?.preventDefault();
   }, [yoeCategory]);
 
+  const { showToast } = useToast();
   trpc.useQuery(
     [
       'offers.list',
@@ -81,8 +82,11 @@ export default function OffersTable({
       },
     ],
     {
-      onError: (err) => {
-        alert(err);
+      onError: () => {
+        showToast({
+          title: 'Error loading the page.',
+          variant: 'failure',
+        });
       },
       onSuccess: (response: GetOffersResponse) => {
         setOffers(response.data);
@@ -95,7 +99,7 @@ export default function OffersTable({
 
   function renderFilters() {
     return (
-      <div className="flex items-center justify-between p-4 text-sm sm:grid-cols-4 md:text-base">
+      <div className="flex items-center justify-between p-4 text-xs text-slate-700 sm:grid-cols-4 sm:text-sm md:text-base">
         <DropdownMenu
           align="start"
           label={
@@ -200,13 +204,13 @@ export default function OffersTable({
     }
 
     return (
-      <thead className="text-slate-700">
+      <thead className="font-semibold">
         <tr className="divide-x divide-slate-200">
           {columns.map((header, index) => (
             <th
               key={header}
               className={clsx(
-                'bg-slate-100 py-3 px-4',
+                'whitespace-nowrap bg-slate-100 py-3 px-4',
                 // Make last column sticky.
                 index === columns.length - 1 &&
                   'sticky right-0 drop-shadow md:drop-shadow-none',
@@ -235,7 +239,7 @@ export default function OffersTable({
         </div>
       ) : (
         <div className="overflow-x-auto text-slate-600">
-          <table className="w-full divide-y divide-slate-200 border-y border-slate-200 text-left">
+          <table className="w-full divide-y divide-slate-200 border-y border-slate-200 text-left text-xs text-slate-700 sm:text-sm md:text-base">
             {renderHeader()}
             <tbody>
               {offers.map((offer) => (
@@ -247,9 +251,6 @@ export default function OffersTable({
             (offers.length === 0 && (
               <div className="py-16 text-lg">
                 <div className="flex justify-center">No data yet🥺</div>
-                <div className="flex justify-center">
-                  Please try another set of filters.
-                </div>
               </div>
             ))}
         </div>
diff --git a/apps/portal/src/components/offers/table/OffersTablePagination.tsx b/apps/portal/src/components/offers/table/OffersTablePagination.tsx
index 9a235901..45dd7831 100644
--- a/apps/portal/src/components/offers/table/OffersTablePagination.tsx
+++ b/apps/portal/src/components/offers/table/OffersTablePagination.tsx
@@ -26,7 +26,7 @@ export default function OffersTablePagination({
         <div className="mb-2 text-sm font-normal text-slate-500 md:mb-0">
           Showing
           <span className="font-semibold text-slate-900">
-            {` ${startNumber} - ${endNumber} `}
+            {` ${endNumber > 0 ? startNumber : 0} - ${endNumber} `}
           </span>
           {`of `}
           <span className="font-semibold text-slate-900">
diff --git a/apps/portal/src/components/offers/types.ts b/apps/portal/src/components/offers/types.ts
index 0e963a17..b38d1540 100644
--- a/apps/portal/src/components/offers/types.ts
+++ b/apps/portal/src/components/offers/types.ts
@@ -4,27 +4,6 @@ import type { MonthYear } from '~/components/shared/MonthYearPicker';
 
 import type { Location } from '~/types/offers';
 
-export const HOME_URL = '/offers';
-
-/*
- *  Offer Profile
- */
-
-export const JobTypeLabel = {
-  FULLTIME: 'Full-time',
-  INTERN: 'Internship',
-};
-
-export enum EducationBackgroundType {
-  Bachelor = 'Bachelor',
-  Diploma = 'Diploma',
-  Masters = 'Masters',
-  PhD = 'PhD',
-  Professional = 'Professional',
-  Secondary = 'Secondary',
-  SelfTaught = 'Self-taught',
-}
-
 export type OffersProfilePostData = {
   background: BackgroundPostData;
   id?: string;
diff --git a/apps/portal/src/components/resumes/comments/ResumeCommentsList.tsx b/apps/portal/src/components/resumes/comments/ResumeCommentsList.tsx
index 271fdd44..b4af9089 100644
--- a/apps/portal/src/components/resumes/comments/ResumeCommentsList.tsx
+++ b/apps/portal/src/components/resumes/comments/ResumeCommentsList.tsx
@@ -57,7 +57,7 @@ export default function ResumeCommentsList({
   }
 
   return (
-    <div className="mb-8 flow-root h-[calc(100vh-13rem)] w-full flex-col space-y-10 overflow-y-auto overflow-x-hidden pb-16">
+    <div className="flow-root w-full flex-col space-y-10 overflow-y-auto overflow-x-hidden lg:h-[calc(100vh-13rem)]">
       {RESUME_COMMENTS_SECTIONS.map(({ label, value }) => {
         const comments = commentsQuery.data
           ? commentsQuery.data.filter((comment: ResumeComment) => {
diff --git a/apps/portal/src/mappers/offers-mappers.ts b/apps/portal/src/mappers/offers-mappers.ts
index 07b37bb0..17355490 100644
--- a/apps/portal/src/mappers/offers-mappers.ts
+++ b/apps/portal/src/mappers/offers-mappers.ts
@@ -87,6 +87,7 @@ const analysisOfferDtoMapper = (
       background?.experiences
         ?.filter((exp) => exp.company != null)
         .map((exp) => exp.company?.name ?? '') ?? [],
+    profileId: offer.profileId,
     profileName,
     title:
       offer.jobType === JobType.FULLTIME
@@ -95,7 +96,10 @@ const analysisOfferDtoMapper = (
     totalYoe: background?.totalYoe ?? -1,
   };
 
-  if (offer.offersFullTime?.totalCompensation) {
+  if (
+    offer.offersFullTime?.totalCompensation &&
+    offer.jobType === JobType.FULLTIME
+  ) {
     analysisOfferDto.income.value =
       offer.offersFullTime.totalCompensation.value;
     analysisOfferDto.income.currency =
@@ -105,7 +109,10 @@ const analysisOfferDtoMapper = (
       offer.offersFullTime.totalCompensation.baseValue;
     analysisOfferDto.income.baseCurrency =
       offer.offersFullTime.totalCompensation.baseCurrency;
-  } else if (offer.offersIntern?.monthlySalary) {
+  } else if (
+    offer.offersIntern?.monthlySalary &&
+    offer.jobType === JobType.INTERN
+  ) {
     analysisOfferDto.income.value = offer.offersIntern.monthlySalary.value;
     analysisOfferDto.income.currency =
       offer.offersIntern.monthlySalary.currency;
@@ -369,13 +376,15 @@ export const experienceDtoMapper = (
       experience.location != null
         ? locationDtoMapper(experience.location)
         : null,
-    monthlySalary: experience.monthlySalary
-      ? valuationDtoMapper(experience.monthlySalary)
-      : null,
+    monthlySalary:
+      experience.monthlySalary && experience.jobType === JobType.INTERN
+        ? valuationDtoMapper(experience.monthlySalary)
+        : null,
     title: experience.title,
-    totalCompensation: experience.totalCompensation
-      ? valuationDtoMapper(experience.totalCompensation)
-      : null,
+    totalCompensation:
+      experience.totalCompensation && experience.jobType === JobType.FULLTIME
+        ? valuationDtoMapper(experience.totalCompensation)
+        : null,
   };
   return experienceDto;
 };
@@ -460,11 +469,11 @@ export const profileOfferDtoMapper = (
     location: locationDtoMapper(offer.location),
     monthYearReceived: offer.monthYearReceived,
     negotiationStrategy: offer.negotiationStrategy,
-    offersFullTime: offer.offersFullTime,
-    offersIntern: offer.offersIntern,
+    offersFullTime: null,
+    offersIntern: null,
   };
 
-  if (offer.offersFullTime) {
+  if (offer.offersFullTime && offer.jobType === JobType.FULLTIME) {
     profileOfferDto.offersFullTime = {
       baseSalary:
         offer.offersFullTime?.baseSalary != null
@@ -485,7 +494,7 @@ export const profileOfferDtoMapper = (
         offer.offersFullTime.totalCompensation,
       ),
     };
-  } else if (offer.offersIntern) {
+  } else if (offer.offersIntern && offer.jobType === JobType.INTERN) {
     profileOfferDto.offersIntern = {
       id: offer.offersIntern.id,
       internshipCycle: offer.offersIntern.internshipCycle,
@@ -701,30 +710,27 @@ export const dashboardOfferDtoMapper = (
     totalYoe: offer.profile.background?.totalYoe ?? -1,
   };
 
-  if (offer.offersFullTime) {
+  if (offer.offersFullTime && offer.jobType === JobType.FULLTIME) {
     dashboardOfferDto.income = valuationDtoMapper(
       offer.offersFullTime.totalCompensation,
     );
 
     if (offer.offersFullTime.baseSalary) {
       dashboardOfferDto.baseSalary = valuationDtoMapper(
-        offer.offersFullTime.baseSalary
+        offer.offersFullTime.baseSalary,
       );
     }
 
     if (offer.offersFullTime.bonus) {
-      dashboardOfferDto.bonus = valuationDtoMapper(
-        offer.offersFullTime.bonus
-      );
-
+      dashboardOfferDto.bonus = valuationDtoMapper(offer.offersFullTime.bonus);
     }
 
     if (offer.offersFullTime.stocks) {
       dashboardOfferDto.stocks = valuationDtoMapper(
-        offer.offersFullTime.stocks
+        offer.offersFullTime.stocks,
       );
     }
-  } else if (offer.offersIntern) {
+  } else if (offer.offersIntern && offer.jobType === JobType.INTERN) {
     dashboardOfferDto.income = valuationDtoMapper(
       offer.offersIntern.monthlySalary,
     );
@@ -736,12 +742,12 @@ export const dashboardOfferDtoMapper = (
 export const getOffersResponseMapper = (
   data: Array<DashboardOffer>,
   paging: Paging,
-  jobType: JobType
+  jobType: JobType,
 ) => {
   const getOffersResponse: GetOffersResponse = {
     data,
     jobType,
-    paging
+    paging,
   };
   return getOffersResponse;
 };
@@ -817,7 +823,10 @@ const userProfileOfferDtoMapper = (
         : offer.offersIntern?.title ?? '',
   };
 
-  if (offer.offersFullTime?.totalCompensation) {
+  if (
+    offer.offersFullTime?.totalCompensation &&
+    offer.jobType === JobType.FULLTIME
+  ) {
     mappedOffer.income.value = offer.offersFullTime.totalCompensation.value;
     mappedOffer.income.currency =
       offer.offersFullTime.totalCompensation.currency;
@@ -826,7 +835,10 @@ const userProfileOfferDtoMapper = (
       offer.offersFullTime.totalCompensation.baseValue;
     mappedOffer.income.baseCurrency =
       offer.offersFullTime.totalCompensation.baseCurrency;
-  } else if (offer.offersIntern?.monthlySalary) {
+  } else if (
+    offer.offersIntern?.monthlySalary &&
+    offer.jobType === JobType.INTERN
+  ) {
     mappedOffer.income.value = offer.offersIntern.monthlySalary.value;
     mappedOffer.income.currency = offer.offersIntern.monthlySalary.currency;
     mappedOffer.income.id = offer.offersIntern.monthlySalary.id;
diff --git a/apps/portal/src/pages/offers/dashboard.tsx b/apps/portal/src/pages/offers/dashboard.tsx
index 1ae9ea46..bb3f5dc8 100644
--- a/apps/portal/src/pages/offers/dashboard.tsx
+++ b/apps/portal/src/pages/offers/dashboard.tsx
@@ -46,8 +46,8 @@ export default function ProfilesDashboard() {
   if (userProfiles.length === 0) {
     return (
       <div className="flex w-full">
-        <div className="m-auto mx-auto w-full justify-center text-xl">
-          <div className="mb-8 flex w-full flex-row justify-center">
+        <div className="w-full justify-center space-y-8 py-16 text-xl">
+          <div className="flex w-full flex-row justify-center">
             <h2>You have not saved any offer profiles yet.</h2>
           </div>
           <div className="flex flex-row justify-center">
diff --git a/apps/portal/src/pages/offers/features.tsx b/apps/portal/src/pages/offers/features.tsx
index 77ca380c..da0cc28d 100644
--- a/apps/portal/src/pages/offers/features.tsx
+++ b/apps/portal/src/pages/offers/features.tsx
@@ -8,12 +8,12 @@ import {
   UsersIcon,
 } from '@heroicons/react/24/outline';
 
+import { HOME_URL } from '~/components/offers/constants';
 import offersAnalysis from '~/components/offers/features/images/offers-analysis.png';
 import offersBrowse from '~/components/offers/features/images/offers-browse.png';
 import offersProfile from '~/components/offers/features/images/offers-profile.png';
 import LeftTextCard from '~/components/offers/features/LeftTextCard';
 import RightTextCard from '~/components/offers/features/RightTextCard';
-import { HOME_URL } from '~/components/offers/types';
 
 const features = [
   {
diff --git a/apps/portal/src/pages/offers/index.tsx b/apps/portal/src/pages/offers/index.tsx
index 9eaeb955..e84173f5 100644
--- a/apps/portal/src/pages/offers/index.tsx
+++ b/apps/portal/src/pages/offers/index.tsx
@@ -59,7 +59,7 @@ export default function OffersHomePage() {
             offers.
           </div>
         </div>
-        <div className="mt-6 flex flex-col items-center justify-center space-y-2 text-base text-slate-700 sm:mt-10 sm:flex-row sm:space-y-0 sm:space-x-4 sm:text-lg">
+        <div className="mt-6 flex flex-col items-center justify-center space-y-2 text-sm text-slate-700 sm:mt-10 sm:flex-row sm:space-y-0 sm:space-x-4 sm:text-lg">
           <span>Viewing offers for</span>
           <div className="flex items-center space-x-4">
             <JobTitlesTypeahead
diff --git a/apps/portal/src/pages/offers/profile/[offerProfileId].tsx b/apps/portal/src/pages/offers/profile/[offerProfileId].tsx
index 092cf8b9..c410dccf 100644
--- a/apps/portal/src/pages/offers/profile/[offerProfileId].tsx
+++ b/apps/portal/src/pages/offers/profile/[offerProfileId].tsx
@@ -6,6 +6,7 @@ import { Spinner, useToast } from '@tih/ui';
 
 import { useGoogleAnalytics } from '~/components/global/GoogleAnalytics';
 import { ProfileDetailTab } from '~/components/offers/constants';
+import { HOME_URL } from '~/components/offers/constants';
 import ProfileComments from '~/components/offers/profile/ProfileComments';
 import ProfileDetails from '~/components/offers/profile/ProfileDetails';
 import ProfileHeader from '~/components/offers/profile/ProfileHeader';
@@ -13,7 +14,6 @@ import type {
   BackgroundDisplayData,
   OfferDisplayData,
 } from '~/components/offers/types';
-import { HOME_URL } from '~/components/offers/types';
 import type { JobTitleType } from '~/components/shared/JobTitles';
 import { getLabelForJobTitleType } from '~/components/shared/JobTitles';
 
@@ -132,6 +132,7 @@ export default function OfferProfile() {
                   ? getLabelForJobTitleType(experience.title as JobTitleType)
                   : null,
                 jobType: experience.jobType || undefined,
+                location: experience.location,
                 monthlySalary: experience.monthlySalary
                   ? convertMoneyToString(experience.monthlySalary)
                   : null,
@@ -214,7 +215,7 @@ export default function OfferProfile() {
                 setSelectedTab={setSelectedTab}
               />
             </div>
-            <div className="pb-4">
+            <div>
               <ProfileDetails
                 analysis={analysis}
                 background={background}
diff --git a/apps/portal/src/pages/offers/submit/result/[offerProfileId].tsx b/apps/portal/src/pages/offers/submit/result/[offerProfileId].tsx
index 35c72796..f507283d 100644
--- a/apps/portal/src/pages/offers/submit/result/[offerProfileId].tsx
+++ b/apps/portal/src/pages/offers/submit/result/[offerProfileId].tsx
@@ -1,11 +1,12 @@
+import Error from 'next/error';
 import { useRouter } from 'next/router';
 import { useEffect, useRef, useState } from 'react';
 import { ArrowLeftIcon, ArrowRightIcon } from '@heroicons/react/20/solid';
 import { EyeIcon } from '@heroicons/react/24/outline';
 import { Button, Spinner } from '@tih/ui';
 
-import type { BreadcrumbStep } from '~/components/offers/Breadcrumb';
-import { Breadcrumbs } from '~/components/offers/Breadcrumb';
+import type { BreadcrumbStep } from '~/components/offers/Breadcrumbs';
+import { Breadcrumbs } from '~/components/offers/Breadcrumbs';
 import OffersProfileSave from '~/components/offers/offersSubmission/OffersProfileSave';
 import OffersSubmissionAnalysis from '~/components/offers/offersSubmission/OffersSubmissionAnalysis';
 
@@ -21,12 +22,21 @@ export default function OffersSubmissionResult() {
   token = token as string;
   const [step, setStep] = useState(0);
   const [analysis, setAnalysis] = useState<ProfileAnalysis | null>(null);
+  const [isValidToken, setIsValidToken] = useState(false);
 
   const pageRef = useRef<HTMLDivElement>(null);
   const scrollToTop = () =>
     pageRef.current?.scrollTo({ behavior: 'smooth', top: 0 });
 
-  // TODO: Check if the token is valid before showing this page
+  const checkToken = trpc.useQuery(
+    ['offers.profile.isValidToken', { profileId: offerProfileId, token }],
+    {
+      onSuccess(data) {
+        setIsValidToken(data);
+      },
+    },
+  );
+
   const getAnalysis = trpc.useQuery(
     ['offers.analysis.get', { profileId: offerProfileId }],
     {
@@ -69,7 +79,7 @@ export default function OffersSubmissionResult() {
 
   return (
     <>
-      {getAnalysis.isLoading && (
+      {(checkToken.isLoading || getAnalysis.isLoading) && (
         <div className="flex h-screen w-screen">
           <div className="m-auto mx-auto w-screen justify-center font-medium text-slate-500">
             <Spinner display="block" size="lg" />
@@ -77,7 +87,13 @@ export default function OffersSubmissionResult() {
           </div>
         </div>
       )}
-      {!getAnalysis.isLoading && (
+      {checkToken.isSuccess && !isValidToken && (
+        <Error
+          statusCode={403}
+          title="You do not have permissions to access this page"
+        />
+      )}
+      {getAnalysis.isSuccess && (
         <div ref={pageRef} className="w-full">
           <div className="flex justify-center">
             <div className="block w-full max-w-screen-md overflow-hidden rounded-lg sm:shadow-lg md:my-10">
diff --git a/apps/portal/src/pages/resumes/[resumeId].tsx b/apps/portal/src/pages/resumes/[resumeId].tsx
index 4e6c9bea..2fea9d4f 100644
--- a/apps/portal/src/pages/resumes/[resumeId].tsx
+++ b/apps/portal/src/pages/resumes/[resumeId].tsx
@@ -236,8 +236,8 @@ export default function ResumeReviewPage() {
           <Head>
             <title>{detailsQuery.data.title}</title>
           </Head>
-          <main className="h-full flex-1 space-y-2 overflow-y-auto py-4 px-8 xl:px-12 2xl:pr-16">
-            <div className="flex justify-between">
+          <main className="h-full flex-1 space-y-2 py-4 px-8 xl:px-12 2xl:pr-16">
+            <div className="flex flex-wrap justify-between">
               <h1 className="w-[60%] pr-2 text-2xl font-semibold leading-7 text-slate-900">
                 {detailsQuery.data.title}
               </h1>
diff --git a/apps/portal/src/pages/resumes/index.tsx b/apps/portal/src/pages/resumes/index.tsx
index 549a7849..7b601e40 100644
--- a/apps/portal/src/pages/resumes/index.tsx
+++ b/apps/portal/src/pages/resumes/index.tsx
@@ -395,7 +395,7 @@ export default function ResumeHomePage() {
                 leave="transition ease-in-out duration-300 transform"
                 leaveFrom="translate-x-0"
                 leaveTo="translate-x-full">
-                <Dialog.Panel className="relative ml-auto flex h-full w-full max-w-xs flex-col overflow-y-scroll bg-white py-4 pb-12 shadow-xl">
+                <Dialog.Panel className="relative ml-auto flex h-full w-full max-w-xs flex-col overflow-y-auto bg-white py-4 pb-12 shadow-xl">
                   <div className="flex items-center justify-between px-4">
                     <h2 className="text-lg font-medium text-slate-900">
                       Quick access
@@ -614,7 +614,7 @@ export default function ResumeHomePage() {
             </div>
           </div>
           <div className="relative lg:left-64 lg:w-[calc(100%-16rem)]">
-            <div className="lg:border-grey-200 sticky top-0 z-10 flex flex-wrap items-center justify-between pt-6 pb-2 lg:border-b">
+            <div className="lg:border-grey-200 sticky top-16 z-10 flex flex-wrap items-center justify-between bg-slate-50 pt-6 pb-2 lg:border-b">
               <div className="border-grey-200 mb-4 flex w-full justify-between border-b pb-2 lg:mb-0 lg:w-auto lg:border-none xl:pb-0">
                 <div>
                   <Tabs
@@ -705,13 +705,13 @@ export default function ResumeHomePage() {
                 {getEmptyDataText(tabsValue, searchValue, userFilters)}
               </div>
             ) : (
-              <div className="h-[calc(100vh-9rem)] pb-10 lg:h-[calc(100vh-6rem)]">
+              <div>
                 <div className="h-[85%] overflow-y-auto">
                   <div>
                     <ResumeListItems resumes={getTabResumes()} />
                   </div>
                 </div>
-                <div className="flex h-[15%] items-center justify-center">
+                <div className="flex h-[15%] items-center justify-center p-4">
                   {getTabTotalPages() > 1 && (
                     <div>
                       <Pagination
diff --git a/apps/portal/src/pages/resumes/submit.tsx b/apps/portal/src/pages/resumes/submit.tsx
index 8aefe28b..935e57c2 100644
--- a/apps/portal/src/pages/resumes/submit.tsx
+++ b/apps/portal/src/pages/resumes/submit.tsx
@@ -246,7 +246,7 @@ export default function SubmitResumeForm({
         </div>
       )}
       {status === 'authenticated' && (
-        <main className="h-[calc(100vh-4rem)] flex-1 overflow-y-auto">
+        <main className="flex-1">
           <section
             aria-labelledby="primary-heading"
             className="flex h-full min-w-0 flex-1 flex-col lg:order-last">
diff --git a/apps/portal/src/server/router/offers/offers-profile-router.ts b/apps/portal/src/server/router/offers/offers-profile-router.ts
index 39cd0d4f..cdf0c8b8 100644
--- a/apps/portal/src/server/router/offers/offers-profile-router.ts
+++ b/apps/portal/src/server/router/offers/offers-profile-router.ts
@@ -972,7 +972,19 @@ export const offersProfileRouter = createRouter()
 
         for (const exp of input.background.experiences) {
           if (exp.id) {
-            // Update existing experience
+            const currentExp = await ctx.prisma.offersExperience.findFirst({
+              where: {
+                id: exp.id
+              }
+            })
+
+            if (!currentExp) {
+              throw new trpc.TRPCError({
+                code: 'NOT_FOUND',
+                message: 'Experience does not exist',
+              });
+            }
+
             await ctx.prisma.offersExperience.update({
               data: {
                 companyId: exp.companyId, // TODO: check if can change with connect or whether there is a difference
@@ -984,73 +996,164 @@ export const offersProfileRouter = createRouter()
                 id: exp.id,
               },
             });
+            if (currentExp.jobType === exp.jobType) {
+              // Update existing experience
+              if (exp.monthlySalary) {
+                await ctx.prisma.offersExperience.update({
+                  data: {
+                    monthlySalary: {
+                      upsert: {
+                        create: {
+                          baseCurrency: baseCurrencyString,
+                          baseValue: await convert(
+                            exp.monthlySalary.value,
+                            exp.monthlySalary.currency,
+                            baseCurrencyString,
+                          ),
+                          currency: exp.monthlySalary.currency,
+                          value: exp.monthlySalary.value,
+                        },
+                        update: {
+                          baseCurrency: baseCurrencyString,
+                          baseValue: await convert(
+                            exp.monthlySalary.value,
+                            exp.monthlySalary.currency,
+                            baseCurrencyString,
+                          ),
+                          currency: exp.monthlySalary.currency,
+                          value: exp.monthlySalary.value,
+                        },
+                      },
+                    },
+                  },
+                  where: {
+                    id: exp.id,
+                  },
+                });
+              }
 
-            if (exp.monthlySalary) {
-              await ctx.prisma.offersExperience.update({
-                data: {
-                  monthlySalary: {
-                    upsert: {
-                      create: {
-                        baseCurrency: baseCurrencyString,
-                        baseValue: await convert(
-                          exp.monthlySalary.value,
-                          exp.monthlySalary.currency,
-                          baseCurrencyString,
-                        ),
-                        currency: exp.monthlySalary.currency,
-                        value: exp.monthlySalary.value,
+              if (exp.totalCompensation) {
+                await ctx.prisma.offersExperience.update({
+                  data: {
+                    totalCompensation: {
+                      upsert: {
+                        create: {
+                          baseCurrency: baseCurrencyString,
+                          baseValue: await convert(
+                            exp.totalCompensation.value,
+                            exp.totalCompensation.currency,
+                            baseCurrencyString,
+                          ),
+                          currency: exp.totalCompensation.currency,
+                          value: exp.totalCompensation.value,
+                        },
+                        update: {
+                          baseCurrency: baseCurrencyString,
+                          baseValue: await convert(
+                            exp.totalCompensation.value,
+                            exp.totalCompensation.currency,
+                            baseCurrencyString,
+                          ),
+                          currency: exp.totalCompensation.currency,
+                          value: exp.totalCompensation.value,
+                        },
                       },
-                      update: {
-                        baseCurrency: baseCurrencyString,
-                        baseValue: await convert(
-                          exp.monthlySalary.value,
-                          exp.monthlySalary.currency,
-                          baseCurrencyString,
-                        ),
-                        currency: exp.monthlySalary.currency,
-                        value: exp.monthlySalary.value,
+                    },
+                  },
+                  where: {
+                    id: exp.id,
+                  },
+                });
+              }
+            } else if (exp.jobType === JobType.INTERN) {
+              // Add 1 remove the other
+              if (exp.monthlySalary) {
+                await ctx.prisma.offersExperience.update({
+                  data: {
+                    monthlySalary: {
+                      upsert: {
+                        create: {
+                          baseCurrency: baseCurrencyString,
+                          baseValue: await convert(
+                            exp.monthlySalary.value,
+                            exp.monthlySalary.currency,
+                            baseCurrencyString,
+                          ),
+                          currency: exp.monthlySalary.currency,
+                          value: exp.monthlySalary.value,
+                        },
+                        update: {
+                          baseCurrency: baseCurrencyString,
+                          baseValue: await convert(
+                            exp.monthlySalary.value,
+                            exp.monthlySalary.currency,
+                            baseCurrencyString,
+                          ),
+                          currency: exp.monthlySalary.currency,
+                          value: exp.monthlySalary.value,
+                        },
                       },
                     },
                   },
-                },
-                where: {
-                  id: exp.id,
-                },
-              });
-            }
+                  where: {
+                    id: exp.id,
+                  },
+                });
+              }
 
-            if (exp.totalCompensation) {
               await ctx.prisma.offersExperience.update({
                 data: {
-                  totalCompensation: {
-                    upsert: {
-                      create: {
-                        baseCurrency: baseCurrencyString,
-                        baseValue: await convert(
-                          exp.totalCompensation.value,
-                          exp.totalCompensation.currency,
-                          baseCurrencyString,
-                        ),
-                        currency: exp.totalCompensation.currency,
-                        value: exp.totalCompensation.value,
-                      },
-                      update: {
-                        baseCurrency: baseCurrencyString,
-                        baseValue: await convert(
-                          exp.totalCompensation.value,
-                          exp.totalCompensation.currency,
-                          baseCurrencyString,
-                        ),
-                        currency: exp.totalCompensation.currency,
-                        value: exp.totalCompensation.value,
+                  totalCompensation: undefined,
+                  totalCompensationId: null,
+                },
+                where: {
+                  id: exp.id
+                }
+              })
+            } else if (exp.jobType === JobType.FULLTIME) {
+                if (exp.totalCompensation) {
+                  await ctx.prisma.offersExperience.update({
+                    data: {
+                      totalCompensation: {
+                        upsert: {
+                          create: {
+                            baseCurrency: baseCurrencyString,
+                            baseValue: await convert(
+                              exp.totalCompensation.value,
+                              exp.totalCompensation.currency,
+                              baseCurrencyString,
+                            ),
+                            currency: exp.totalCompensation.currency,
+                            value: exp.totalCompensation.value,
+                          },
+                          update: {
+                            baseCurrency: baseCurrencyString,
+                            baseValue: await convert(
+                              exp.totalCompensation.value,
+                              exp.totalCompensation.currency,
+                              baseCurrencyString,
+                            ),
+                            currency: exp.totalCompensation.currency,
+                            value: exp.totalCompensation.value,
+                          },
+                        },
                       },
                     },
+                    where: {
+                      id: exp.id,
+                    },
+                  });
+                }
+
+                await ctx.prisma.offersExperience.update({
+                  data: {
+                    monthlySalary: undefined,
+                    monthlySalaryId: null
                   },
-                },
-                where: {
-                  id: exp.id,
-                },
-              });
+                  where: {
+                    id: exp.id
+                  }
+                })
             }
           } else if (!exp.id) {
             // Create new experience
@@ -1581,6 +1684,18 @@ export const offersProfileRouter = createRouter()
         for (const offerToUpdate of input.offers) {
           if (offerToUpdate.id) {
             // Update existing offer
+            const currentOffer = await ctx.prisma.offersOffer.findFirst({
+              where: {
+                id: offerToUpdate.id
+              }
+            })
+
+            if (!currentOffer) {
+              throw new trpc.TRPCError({
+                code: 'NOT_FOUND',
+                message: 'Offer to update does not exist',
+              });
+            }
             await ctx.prisma.offersOffer.update({
               data: {
                 comments: offerToUpdate.comments,
@@ -1606,82 +1721,191 @@ export const offersProfileRouter = createRouter()
               },
             });
 
-            if (offerToUpdate.offersIntern?.monthlySalary != null) {
-              await ctx.prisma.offersIntern.update({
-                data: {
-                  internshipCycle:
-                    offerToUpdate.offersIntern.internshipCycle ?? undefined,
-                  monthlySalary: {
-                    upsert: {
-                      create: {
-                        baseCurrency: baseCurrencyString,
-                        baseValue: await convert(
-                          offerToUpdate.offersIntern.monthlySalary.value,
-                          offerToUpdate.offersIntern.monthlySalary.currency,
-                          baseCurrencyString,
-                        ),
-                        currency:
-                          offerToUpdate.offersIntern.monthlySalary.currency,
-                        value: offerToUpdate.offersIntern.monthlySalary.value,
-                      },
-                      update: {
-                        baseCurrency: baseCurrencyString,
-                        baseValue: await convert(
-                          offerToUpdate.offersIntern.monthlySalary.value,
-                          offerToUpdate.offersIntern.monthlySalary.currency,
-                          baseCurrencyString,
-                        ),
-                        currency:
-                          offerToUpdate.offersIntern.monthlySalary.currency,
-                        value: offerToUpdate.offersIntern.monthlySalary.value,
+            if (currentOffer.jobType === offerToUpdate.jobType) {
+              if (offerToUpdate.offersIntern?.monthlySalary != null) {
+                await ctx.prisma.offersIntern.update({
+                  data: {
+                    internshipCycle:
+                      offerToUpdate.offersIntern.internshipCycle ?? undefined,
+                    monthlySalary: {
+                      upsert: {
+                        create: {
+                          baseCurrency: baseCurrencyString,
+                          baseValue: await convert(
+                            offerToUpdate.offersIntern.monthlySalary.value,
+                            offerToUpdate.offersIntern.monthlySalary.currency,
+                            baseCurrencyString,
+                          ),
+                          currency:
+                            offerToUpdate.offersIntern.monthlySalary.currency,
+                          value: offerToUpdate.offersIntern.monthlySalary.value,
+                        },
+                        update: {
+                          baseCurrency: baseCurrencyString,
+                          baseValue: await convert(
+                            offerToUpdate.offersIntern.monthlySalary.value,
+                            offerToUpdate.offersIntern.monthlySalary.currency,
+                            baseCurrencyString,
+                          ),
+                          currency:
+                            offerToUpdate.offersIntern.monthlySalary.currency,
+                          value: offerToUpdate.offersIntern.monthlySalary.value,
+                        },
                       },
                     },
+                    startYear: offerToUpdate.offersIntern.startYear ?? undefined,
+                    title: offerToUpdate.offersIntern.title,
                   },
-                  startYear: offerToUpdate.offersIntern.startYear ?? undefined,
-                  title: offerToUpdate.offersIntern.title,
-                },
-                where: {
-                  id: offerToUpdate.offersIntern.id,
-                },
-              });
-            }
+                  where: {
+                    id: offerToUpdate.offersIntern.id,
+                  },
+                });
+              }
 
-            if (offerToUpdate.offersFullTime?.totalCompensation != null) {
-              await ctx.prisma.offersFullTime.update({
-                data: {
-                  level: offerToUpdate.offersFullTime.level ?? undefined,
-                  title: offerToUpdate.offersFullTime.title,
-                },
-                where: {
-                  id: offerToUpdate.offersFullTime.id,
-                },
-              });
-              if (offerToUpdate.offersFullTime.baseSalary != null) {
+              if (offerToUpdate.offersFullTime?.totalCompensation != null) {
+                await ctx.prisma.offersFullTime.update({
+                  data: {
+                    level: offerToUpdate.offersFullTime.level ?? undefined,
+                    title: offerToUpdate.offersFullTime.title,
+                  },
+                  where: {
+                    id: offerToUpdate.offersFullTime.id,
+                  },
+                });
+                if (offerToUpdate.offersFullTime.baseSalary != null) {
+                  await ctx.prisma.offersFullTime.update({
+                    data: {
+                      baseSalary: {
+                        upsert: {
+                          create: {
+                            baseCurrency: baseCurrencyString,
+                            baseValue: await convert(
+                              offerToUpdate.offersFullTime.baseSalary.value,
+                              offerToUpdate.offersFullTime.baseSalary.currency,
+                              baseCurrencyString,
+                            ),
+                            currency:
+                              offerToUpdate.offersFullTime.baseSalary.currency,
+                            value: offerToUpdate.offersFullTime.baseSalary.value,
+                          },
+                          update: {
+                            baseCurrency: baseCurrencyString,
+                            baseValue: await convert(
+                              offerToUpdate.offersFullTime.baseSalary.value,
+                              offerToUpdate.offersFullTime.baseSalary.currency,
+                              baseCurrencyString,
+                            ),
+                            currency:
+                              offerToUpdate.offersFullTime.baseSalary.currency,
+                            value: offerToUpdate.offersFullTime.baseSalary.value,
+                          },
+                        },
+                      },
+                    },
+                    where: {
+                      id: offerToUpdate.offersFullTime.id,
+                    },
+                  });
+                }
+                if (offerToUpdate.offersFullTime.bonus != null) {
+                  await ctx.prisma.offersFullTime.update({
+                    data: {
+                      bonus: {
+                        upsert: {
+                          create: {
+                            baseCurrency: baseCurrencyString,
+                            baseValue: await convert(
+                              offerToUpdate.offersFullTime.bonus.value,
+                              offerToUpdate.offersFullTime.bonus.currency,
+                              baseCurrencyString,
+                            ),
+                            currency: offerToUpdate.offersFullTime.bonus.currency,
+                            value: offerToUpdate.offersFullTime.bonus.value,
+                          },
+                          update: {
+                            baseCurrency: baseCurrencyString,
+                            baseValue: await convert(
+                              offerToUpdate.offersFullTime.bonus.value,
+                              offerToUpdate.offersFullTime.bonus.currency,
+                              baseCurrencyString,
+                            ),
+                            currency: offerToUpdate.offersFullTime.bonus.currency,
+                            value: offerToUpdate.offersFullTime.bonus.value,
+                          },
+                        },
+                      },
+                    },
+                    where: {
+                      id: offerToUpdate.offersFullTime.id,
+                    },
+                  });
+                }
+                if (offerToUpdate.offersFullTime.stocks != null) {
+                  await ctx.prisma.offersFullTime.update({
+                    data: {
+                      stocks: {
+                        upsert: {
+                          create: {
+                            baseCurrency: baseCurrencyString,
+                            baseValue: await convert(
+                              offerToUpdate.offersFullTime.stocks.value,
+                              offerToUpdate.offersFullTime.stocks.currency,
+                              baseCurrencyString,
+                            ),
+                            currency:
+                              offerToUpdate.offersFullTime.stocks.currency,
+                            value: offerToUpdate.offersFullTime.stocks.value,
+                          },
+                          update: {
+                            baseCurrency: baseCurrencyString,
+                            baseValue: await convert(
+                              offerToUpdate.offersFullTime.stocks.value,
+                              offerToUpdate.offersFullTime.stocks.currency,
+                              baseCurrencyString,
+                            ),
+                            currency:
+                              offerToUpdate.offersFullTime.stocks.currency,
+                            value: offerToUpdate.offersFullTime.stocks.value,
+                          },
+                        },
+                      },
+                    },
+                    where: {
+                      id: offerToUpdate.offersFullTime.id,
+                    },
+                  });
+                }
                 await ctx.prisma.offersFullTime.update({
                   data: {
-                    baseSalary: {
+                    totalCompensation: {
                       upsert: {
                         create: {
                           baseCurrency: baseCurrencyString,
                           baseValue: await convert(
-                            offerToUpdate.offersFullTime.baseSalary.value,
-                            offerToUpdate.offersFullTime.baseSalary.currency,
+                            offerToUpdate.offersFullTime.totalCompensation.value,
+                            offerToUpdate.offersFullTime.totalCompensation
+                              .currency,
                             baseCurrencyString,
                           ),
                           currency:
-                            offerToUpdate.offersFullTime.baseSalary.currency,
-                          value: offerToUpdate.offersFullTime.baseSalary.value,
+                            offerToUpdate.offersFullTime.totalCompensation
+                              .currency,
+                          value:
+                            offerToUpdate.offersFullTime.totalCompensation.value,
                         },
                         update: {
                           baseCurrency: baseCurrencyString,
                           baseValue: await convert(
-                            offerToUpdate.offersFullTime.baseSalary.value,
-                            offerToUpdate.offersFullTime.baseSalary.currency,
+                            offerToUpdate.offersFullTime.totalCompensation.value,
+                            offerToUpdate.offersFullTime.totalCompensation
+                              .currency,
                             baseCurrencyString,
                           ),
                           currency:
-                            offerToUpdate.offersFullTime.baseSalary.currency,
-                          value: offerToUpdate.offersFullTime.baseSalary.value,
+                            offerToUpdate.offersFullTime.totalCompensation
+                              .currency,
+                          value:
+                            offerToUpdate.offersFullTime.totalCompensation.value,
                         },
                       },
                     },
@@ -1691,30 +1915,151 @@ export const offersProfileRouter = createRouter()
                   },
                 });
               }
-              if (offerToUpdate.offersFullTime.bonus != null) {
+            } else if (currentOffer.jobType === JobType.FULLTIME) {
+              if (offerToUpdate.offersFullTime?.totalCompensation != null) {
+                await ctx.prisma.offersFullTime.update({
+                  data: {
+                    level: offerToUpdate.offersFullTime.level ?? undefined,
+                    title: offerToUpdate.offersFullTime.title,
+                  },
+                  where: {
+                    id: offerToUpdate.offersFullTime.id,
+                  },
+                });
+                if (offerToUpdate.offersFullTime.baseSalary != null) {
+                  await ctx.prisma.offersFullTime.update({
+                    data: {
+                      baseSalary: {
+                        upsert: {
+                          create: {
+                            baseCurrency: baseCurrencyString,
+                            baseValue: await convert(
+                              offerToUpdate.offersFullTime.baseSalary.value,
+                              offerToUpdate.offersFullTime.baseSalary.currency,
+                              baseCurrencyString,
+                            ),
+                            currency:
+                              offerToUpdate.offersFullTime.baseSalary.currency,
+                            value: offerToUpdate.offersFullTime.baseSalary.value,
+                          },
+                          update: {
+                            baseCurrency: baseCurrencyString,
+                            baseValue: await convert(
+                              offerToUpdate.offersFullTime.baseSalary.value,
+                              offerToUpdate.offersFullTime.baseSalary.currency,
+                              baseCurrencyString,
+                            ),
+                            currency:
+                              offerToUpdate.offersFullTime.baseSalary.currency,
+                            value: offerToUpdate.offersFullTime.baseSalary.value,
+                          },
+                        },
+                      },
+                    },
+                    where: {
+                      id: offerToUpdate.offersFullTime.id,
+                    },
+                  });
+                }
+                if (offerToUpdate.offersFullTime.bonus != null) {
+                  await ctx.prisma.offersFullTime.update({
+                    data: {
+                      bonus: {
+                        upsert: {
+                          create: {
+                            baseCurrency: baseCurrencyString,
+                            baseValue: await convert(
+                              offerToUpdate.offersFullTime.bonus.value,
+                              offerToUpdate.offersFullTime.bonus.currency,
+                              baseCurrencyString,
+                            ),
+                            currency: offerToUpdate.offersFullTime.bonus.currency,
+                            value: offerToUpdate.offersFullTime.bonus.value,
+                          },
+                          update: {
+                            baseCurrency: baseCurrencyString,
+                            baseValue: await convert(
+                              offerToUpdate.offersFullTime.bonus.value,
+                              offerToUpdate.offersFullTime.bonus.currency,
+                              baseCurrencyString,
+                            ),
+                            currency: offerToUpdate.offersFullTime.bonus.currency,
+                            value: offerToUpdate.offersFullTime.bonus.value,
+                          },
+                        },
+                      },
+                    },
+                    where: {
+                      id: offerToUpdate.offersFullTime.id,
+                    },
+                  });
+                }
+                if (offerToUpdate.offersFullTime.stocks != null) {
+                  await ctx.prisma.offersFullTime.update({
+                    data: {
+                      stocks: {
+                        upsert: {
+                          create: {
+                            baseCurrency: baseCurrencyString,
+                            baseValue: await convert(
+                              offerToUpdate.offersFullTime.stocks.value,
+                              offerToUpdate.offersFullTime.stocks.currency,
+                              baseCurrencyString,
+                            ),
+                            currency:
+                              offerToUpdate.offersFullTime.stocks.currency,
+                            value: offerToUpdate.offersFullTime.stocks.value,
+                          },
+                          update: {
+                            baseCurrency: baseCurrencyString,
+                            baseValue: await convert(
+                              offerToUpdate.offersFullTime.stocks.value,
+                              offerToUpdate.offersFullTime.stocks.currency,
+                              baseCurrencyString,
+                            ),
+                            currency:
+                              offerToUpdate.offersFullTime.stocks.currency,
+                            value: offerToUpdate.offersFullTime.stocks.value,
+                          },
+                        },
+                      },
+                    },
+                    where: {
+                      id: offerToUpdate.offersFullTime.id,
+                    },
+                  });
+                }
                 await ctx.prisma.offersFullTime.update({
                   data: {
-                    bonus: {
+                    totalCompensation: {
                       upsert: {
                         create: {
                           baseCurrency: baseCurrencyString,
                           baseValue: await convert(
-                            offerToUpdate.offersFullTime.bonus.value,
-                            offerToUpdate.offersFullTime.bonus.currency,
+                            offerToUpdate.offersFullTime.totalCompensation.value,
+                            offerToUpdate.offersFullTime.totalCompensation
+                              .currency,
                             baseCurrencyString,
                           ),
-                          currency: offerToUpdate.offersFullTime.bonus.currency,
-                          value: offerToUpdate.offersFullTime.bonus.value,
+                          currency:
+                            offerToUpdate.offersFullTime.totalCompensation
+                              .currency,
+                          value:
+                            offerToUpdate.offersFullTime.totalCompensation.value,
                         },
                         update: {
                           baseCurrency: baseCurrencyString,
                           baseValue: await convert(
-                            offerToUpdate.offersFullTime.bonus.value,
-                            offerToUpdate.offersFullTime.bonus.currency,
+                            offerToUpdate.offersFullTime.totalCompensation.value,
+                            offerToUpdate.offersFullTime.totalCompensation
+                              .currency,
                             baseCurrencyString,
                           ),
-                          currency: offerToUpdate.offersFullTime.bonus.currency,
-                          value: offerToUpdate.offersFullTime.bonus.value,
+                          currency:
+                            offerToUpdate.offersFullTime.totalCompensation
+                              .currency,
+                          value:
+                            offerToUpdate.offersFullTime.totalCompensation.value,
                         },
                       },
                     },
@@ -1724,80 +2069,66 @@ export const offersProfileRouter = createRouter()
                   },
                 });
               }
-              if (offerToUpdate.offersFullTime.stocks != null) {
-                await ctx.prisma.offersFullTime.update({
+
+              await ctx.prisma.offersOffer.update({
+                data: {
+                  offersIntern: undefined,
+                  offersInternId: null
+                },
+                where: {
+                  id: offerToUpdate.id
+                }
+              })
+            } else if (currentOffer.jobType === JobType.INTERN) {
+              if (offerToUpdate.offersIntern?.monthlySalary != null) {
+                await ctx.prisma.offersIntern.update({
                   data: {
-                    stocks: {
+                    internshipCycle:
+                      offerToUpdate.offersIntern.internshipCycle ?? undefined,
+                    monthlySalary: {
                       upsert: {
                         create: {
                           baseCurrency: baseCurrencyString,
                           baseValue: await convert(
-                            offerToUpdate.offersFullTime.stocks.value,
-                            offerToUpdate.offersFullTime.stocks.currency,
+                            offerToUpdate.offersIntern.monthlySalary.value,
+                            offerToUpdate.offersIntern.monthlySalary.currency,
                             baseCurrencyString,
                           ),
                           currency:
-                            offerToUpdate.offersFullTime.stocks.currency,
-                          value: offerToUpdate.offersFullTime.stocks.value,
+                            offerToUpdate.offersIntern.monthlySalary.currency,
+                          value: offerToUpdate.offersIntern.monthlySalary.value,
                         },
                         update: {
                           baseCurrency: baseCurrencyString,
                           baseValue: await convert(
-                            offerToUpdate.offersFullTime.stocks.value,
-                            offerToUpdate.offersFullTime.stocks.currency,
+                            offerToUpdate.offersIntern.monthlySalary.value,
+                            offerToUpdate.offersIntern.monthlySalary.currency,
                             baseCurrencyString,
                           ),
                           currency:
-                            offerToUpdate.offersFullTime.stocks.currency,
-                          value: offerToUpdate.offersFullTime.stocks.value,
+                            offerToUpdate.offersIntern.monthlySalary.currency,
+                          value: offerToUpdate.offersIntern.monthlySalary.value,
                         },
                       },
                     },
+                    startYear: offerToUpdate.offersIntern.startYear ?? undefined,
+                    title: offerToUpdate.offersIntern.title,
                   },
                   where: {
-                    id: offerToUpdate.offersFullTime.id,
+                    id: offerToUpdate.offersIntern.id,
                   },
                 });
               }
-              await ctx.prisma.offersFullTime.update({
+
+              await ctx.prisma.offersOffer.update({
                 data: {
-                  totalCompensation: {
-                    upsert: {
-                      create: {
-                        baseCurrency: baseCurrencyString,
-                        baseValue: await convert(
-                          offerToUpdate.offersFullTime.totalCompensation.value,
-                          offerToUpdate.offersFullTime.totalCompensation
-                            .currency,
-                          baseCurrencyString,
-                        ),
-                        currency:
-                          offerToUpdate.offersFullTime.totalCompensation
-                            .currency,
-                        value:
-                          offerToUpdate.offersFullTime.totalCompensation.value,
-                      },
-                      update: {
-                        baseCurrency: baseCurrencyString,
-                        baseValue: await convert(
-                          offerToUpdate.offersFullTime.totalCompensation.value,
-                          offerToUpdate.offersFullTime.totalCompensation
-                            .currency,
-                          baseCurrencyString,
-                        ),
-                        currency:
-                          offerToUpdate.offersFullTime.totalCompensation
-                            .currency,
-                        value:
-                          offerToUpdate.offersFullTime.totalCompensation.value,
-                      },
-                    },
-                  },
+                  offersFullTime: undefined,
+                  offersFullTimeId: null
                 },
                 where: {
-                  id: offerToUpdate.offersFullTime.id,
-                },
-              });
+                  id: offerToUpdate.id
+                }
+              })
             }
           } else {
             // Create new offer
diff --git a/apps/portal/src/types/offers.d.ts b/apps/portal/src/types/offers.d.ts
index 425d654d..559c9f31 100644
--- a/apps/portal/src/types/offers.d.ts
+++ b/apps/portal/src/types/offers.d.ts
@@ -181,6 +181,7 @@ export type AnalysisOffer = {
   monthYearReceived: Date;
   negotiationStrategy: string;
   previousCompanies: Array<string>;
+  profileId: string;
   profileName: string;
   title: string;
   totalYoe: number;
diff --git a/apps/portal/src/utils/offers/currency/CurrencySelector.tsx b/apps/portal/src/utils/offers/currency/CurrencySelector.tsx
index 2ba883b4..2b339933 100644
--- a/apps/portal/src/utils/offers/currency/CurrencySelector.tsx
+++ b/apps/portal/src/utils/offers/currency/CurrencySelector.tsx
@@ -20,7 +20,7 @@ export default function CurrencySelector({
     <Select
       display="inline"
       isLabelHidden={true}
-      label="Select fruit"
+      label="Currency"
       name=""
       options={currencyOptions}
       value={selectedCurrency}
diff --git a/apps/portal/src/utils/offers/currency/index.tsx b/apps/portal/src/utils/offers/currency/index.tsx
index 1e219c45..b8ab6932 100644
--- a/apps/portal/src/utils/offers/currency/index.tsx
+++ b/apps/portal/src/utils/offers/currency/index.tsx
@@ -4,7 +4,11 @@ import { Currency } from './CurrencyEnum';
 
 export const baseCurrencyString = Currency.USD.toString();
 
-export function convertMoneyToString({ currency, value }: Money) {
+export function convertMoneyToString(money: Money | undefined) {
+  if (!money) {
+    return '-';
+  }
+  const { currency, value } = money;
   if (!value) {
     return '-';
   }
diff --git a/apps/portal/src/utils/offers/string.tsx b/apps/portal/src/utils/offers/string.tsx
new file mode 100644
index 00000000..26fb3557
--- /dev/null
+++ b/apps/portal/src/utils/offers/string.tsx
@@ -0,0 +1,37 @@
+import type { JobType } from '@prisma/client';
+
+import { JobTypeLabel } from '~/components/offers/constants';
+
+import type { Location } from '~/types/offers';
+
+export function joinWithComma(...strings: Array<string | null | undefined>) {
+  return strings.filter((value) => !!value).join(', ');
+}
+
+export function getLocationDisplayText({ cityName, countryName }: Location) {
+  return cityName === countryName
+    ? cityName
+    : joinWithComma(cityName, countryName);
+}
+
+export function getCompanyDisplayText(
+  companyName?: string | null,
+  location?: Location | null,
+) {
+  if (!location) {
+    return companyName;
+  }
+  return joinWithComma(companyName, getLocationDisplayText(location));
+}
+
+export function getJobDisplayText(
+  jobTitle?: string | null,
+  jobLevel?: string | null,
+  jobType?: JobType | null,
+) {
+  let jobDisplay = joinWithComma(jobTitle, jobLevel);
+  if (jobType) {
+    jobDisplay = jobDisplay.concat(` (${JobTypeLabel[jobType]})`);
+  }
+  return jobDisplay;
+}
diff --git a/packages/ui/src/Typeahead/Typeahead.tsx b/packages/ui/src/Typeahead/Typeahead.tsx
index 8baf0776..1f1f3242 100644
--- a/packages/ui/src/Typeahead/Typeahead.tsx
+++ b/packages/ui/src/Typeahead/Typeahead.tsx
@@ -144,7 +144,7 @@ export default function Typeahead({
             <Combobox.Input
               aria-describedby={hasError ? errorId : undefined}
               className={clsx(
-                'w-full border-none py-2 pl-3 pr-10 leading-5 focus:ring-0',
+                'w-full border-none py-2 pl-3 pr-10 text-[length:inherit] leading-5 focus:ring-0',
                 stateClasses[state].input,
                 textSizes[textSize],
                 'disabled:cursor-not-allowed disabled:bg-transparent disabled:text-slate-500',