diff --git a/app/api/client.ts b/app/api/client.ts
index bf0f0d6..57dae8c 100644
--- a/app/api/client.ts
+++ b/app/api/client.ts
@@ -59,9 +59,9 @@ export class CtpApiClient {
 
   private readonly anonymousIdStorageKey = 'anonymous_id'
 
-  private public: ByProjectKeyRequestBuilder
-  private protected?: ByProjectKeyRequestBuilder
-  private current: ByProjectKeyRequestBuilder
+  private publicInstance: ByProjectKeyRequestBuilder
+  private protectedInstance?: ByProjectKeyRequestBuilder
+  private currentInstance: ByProjectKeyRequestBuilder
 
   constructor({
     authUri = String(import.meta.env.VITE_CTP_AUTH_URL),
@@ -78,18 +78,18 @@ export class CtpApiClient {
     this.projectKey = projectKey
     this.scopes = scopes
 
-    this.public = this.createPublic()
+    this.publicInstance = this.createPublicInstance()
 
     if (this.hasToken) {
-      this.protected = this.createProtectedWithToken()
-      this.current = this.protected
+      this.protectedInstance = this.createProtectedWithTokenInstance()
+      this.currentInstance = this.protectedInstance ?? this.publicInstance
     } else {
-      this.current = this.public
+      this.currentInstance = this.publicInstance
     }
   }
 
   public get root(): ByProjectKeyRequestBuilder {
-    return this.current
+    return this.currentInstance
   }
 
   public get hasToken(): boolean {
@@ -114,7 +114,7 @@ export class CtpApiClient {
 
   public async login(email: string, password: string): Promise<ClientResponse<Customer>> {
     const request: () => ApiRequest<CustomerSignInResult> = () =>
-      this.public
+      this.publicInstance
         .me()
         .login()
         .post({
@@ -129,11 +129,11 @@ export class CtpApiClient {
     try {
       await request().execute()
     } catch (error) {
-      await this.handleError<CustomerSignInResult>({ error, request })
+      await this.handleAuthError<CustomerSignInResult>({ error, request })
     }
 
-    this.protected = this.createProtectedWithCredentials(email, password)
-    this.current = this.protected
+    this.protectedInstance = this.createProtectedWithCredentialsInstance(email, password)
+    this.currentInstance = this.protectedInstance
 
     return await this.getCurrentCustomer()
   }
@@ -141,13 +141,13 @@ export class CtpApiClient {
   public logout(): void {
     this.protectedTokenCache.remove()
     this.publicTokenCache.remove()
-    this.public = this.createPublic()
-    this.protected = undefined
-    this.current = this.public
+    this.publicInstance = this.createPublicInstance()
+    this.protectedInstance = undefined
+    this.currentInstance = this.publicInstance
   }
 
   public getCurrentCustomerBuilder(): ByProjectKeyMeRequestBuilder {
-    return this.current.me()
+    return this.currentInstance.me()
   }
 
   public async getCurrentCustomer(): Promise<ClientResponse<Customer>> {
@@ -159,7 +159,7 @@ export class CtpApiClient {
     const shippingAddressIndex = payload.addresses.findIndex(({ type }) => type === CUSTOMER_ADDRESS_TYPE.SHIPPING)
 
     const request: () => ApiRequest<CustomerSignInResult> = () =>
-      this.public
+      this.publicInstance
         .me()
         .signup()
         .post({
@@ -187,7 +187,7 @@ export class CtpApiClient {
     try {
       return await request().execute()
     } catch (error) {
-      return await this.handleError<CustomerSignInResult>({ error, request })
+      return await this.handleAuthError<CustomerSignInResult>({ error, request })
     }
   }
 
@@ -200,7 +200,7 @@ export class CtpApiClient {
     }
   }
 
-  private createPublic(): ByProjectKeyRequestBuilder {
+  private createPublicInstance(): ByProjectKeyRequestBuilder {
     const anonymousId = this.getOrCreateAnonymousId()
 
     const client = new ClientBuilder()
@@ -226,7 +226,7 @@ export class CtpApiClient {
     })
   }
 
-  private createProtectedWithCredentials(email: string, password: string): ByProjectKeyRequestBuilder {
+  private createProtectedWithCredentialsInstance(email: string, password: string): ByProjectKeyRequestBuilder {
     const client = new ClientBuilder()
       .withProjectKey(this.projectKey)
       .withPasswordFlow({
@@ -246,11 +246,12 @@ export class CtpApiClient {
     })
   }
 
-  private createProtectedWithToken(): ByProjectKeyRequestBuilder {
-    const { refreshToken } = this.protectedTokenCache.get()
+  private createProtectedWithTokenInstance(): ByProjectKeyRequestBuilder | undefined {
+    const refreshToken = this.getRefreshToken()
 
     if (refreshToken === undefined) {
-      throw new Error('Refresh token is missing')
+      this.logout()
+      return undefined
     }
 
     const client = new ClientBuilder()
@@ -272,7 +273,7 @@ export class CtpApiClient {
     })
   }
 
-  private async handleError<T>({
+  private async handleAuthError<T>({
     error,
     request
   }: {
@@ -289,6 +290,14 @@ export class CtpApiClient {
     return await request().execute()
   }
 
+  private getRefreshToken(): string | undefined {
+    try {
+      return this.protectedTokenCache.get().refreshToken
+    } catch {
+      return undefined
+    }
+  }
+
   private getOrCreateAnonymousId(): string {
     let id = this.getAnonymousIdFromStorage()
 
diff --git a/app/layouts/components/Footer/FooterBody.tsx b/app/layouts/components/Footer/FooterBody.tsx
index 517dabe..b7a7ef8 100644
--- a/app/layouts/components/Footer/FooterBody.tsx
+++ b/app/layouts/components/Footer/FooterBody.tsx
@@ -12,8 +12,8 @@ type FooterProps = {
 export function Footer({ categories }: FooterProps): ReactElement {
   return (
     <footer className="bg-white border-t text-sm text-muted-foreground">
-      <div className="w-full bg-neutral-900/90 text-white py-6 px-4">
-        <div className="container mx-auto flex flex-col md:flex-row md:items-center justify-between gap-4 text-center md:text-left">
+      <div className="w-full bg-neutral-900/90 text-white py-6">
+        <div className="container mx-auto max-w-[1280px] px-8 flex flex-col md:flex-row md:items-center justify-between gap-4 text-center md:text-left">
           <div className="text-lg font-semibold">FURNITURE SHOP</div>
           <div className="flex flex-col sm:flex-row gap-2 sm:gap-6 text-base text-white/90 sm:items-center sm:text-right">
             <a
@@ -32,7 +32,7 @@ export function Footer({ categories }: FooterProps): ReactElement {
           </div>
         </div>
       </div>
-      <div className="grid grid-cols-2 sm:grid-cols-2 md:grid-cols-5 gap-8  py-10 container mx-auto ">
+      <div className="grid grid-cols-2 sm:grid-cols-2 md:grid-cols-5 gap-8 px-4 py-10 container mx-auto max-w-[1280px]">
         <InfoAndHelp />
         <FooterCategories categories={categories} />
         <SocialMedia />
diff --git a/app/layouts/components/Footer/FooterCategories.tsx b/app/layouts/components/Footer/FooterCategories.tsx
index d0bd166..fbc20ac 100644
--- a/app/layouts/components/Footer/FooterCategories.tsx
+++ b/app/layouts/components/Footer/FooterCategories.tsx
@@ -13,7 +13,7 @@ export function FooterCategories({ categories }: Props): ReactElement {
       <ul className="space-y-2">
         {categories.map((category) => (
           <li key={category.id}>
-            <CategoryLink category={category} />
+            <CategoryLink category={category} defaultClassName="hover:underline" activeClassName="" />
           </li>
         ))}
       </ul>
diff --git a/app/layouts/components/Navigation.tsx b/app/layouts/components/Navigation.tsx
index 096d336..34f12bf 100644
--- a/app/layouts/components/Navigation.tsx
+++ b/app/layouts/components/Navigation.tsx
@@ -16,7 +16,7 @@ type NavigationProps = {
 }
 
 type NavItem = {
-  to: string
+  to: ROUTES
   label: string
   icon: ElementType
   auth?: boolean
@@ -40,7 +40,7 @@ export function Navigation({ isAuth }: NavigationProps): ReactElement {
     <NavigationMenu>
       <NavigationMenuList className="grid grid-cols-3 sm:flex justify-center gap-2">
         {filteredItems.map(({ to, label, icon: Icon }) => {
-          const isCart = label === 'Cart'
+          const isCart = to === ROUTES.CART
 
           return (
             <NavigationMenuItem key={label}>
diff --git a/app/pages/about/TeamMember.tsx b/app/pages/about/TeamMember.tsx
index 8885408..6bbb906 100644
--- a/app/pages/about/TeamMember.tsx
+++ b/app/pages/about/TeamMember.tsx
@@ -13,6 +13,9 @@ type TeamMemberProps = {
   imageUrl: string
 }
 
+const TEAM_MEMBER_IMAGE_WIDTH = 300
+const TEAM_MEMBER_IMAGE_HEIGHT = 500
+
 export function TeamMember({
   name,
   location,
@@ -22,13 +25,15 @@ export function TeamMember({
   github,
   imageUrl
 }: TeamMemberProps): ReactElement {
+  const imgClassName = `rounded-2xl md:w-[${TEAM_MEMBER_IMAGE_WIDTH}px] md:h-auto object-cover`
+
   return (
     <div className="max-w-7xl mx-auto flex flex-col md:flex-row gap-8 items-center">
       <img
         src={imageUrl}
-        width={300}
-        height={500}
-        className="rounded-2xl md:w-[300px] md:h-auto object-cover"
+        width={TEAM_MEMBER_IMAGE_WIDTH}
+        height={TEAM_MEMBER_IMAGE_HEIGHT}
+        className={imgClassName}
         alt={name}
       />
       <div className="flex flex-col text-left self-start">
diff --git a/app/pages/cart/CartItem/CartItem.tsx b/app/pages/cart/CartItem/CartItem.tsx
index 7624aae..8144628 100644
--- a/app/pages/cart/CartItem/CartItem.tsx
+++ b/app/pages/cart/CartItem/CartItem.tsx
@@ -10,6 +10,8 @@ type CartItemProps = {
   lineItem: LineItem
 }
 
+const MIN_QUANTITY = 1
+
 export function CartItem({ lineItem }: CartItemProps): ReactElement {
   const { name, productId, quantity, price, totalPrice, variant } = lineItem
   const dispatch = useAppDispatch()
@@ -19,13 +21,20 @@ export function CartItem({ lineItem }: CartItemProps): ReactElement {
   const isCartLoading = status === CART_TABLE_STATUS.LOADING
 
   const handleQuantityChange = async (newQuantity: number): Promise<void> => {
-    if (isCartLoading || newQuantity < 1) return
+    if (isCartLoading || newQuantity < MIN_QUANTITY) {
+      return
+    }
+
     await dispatch(updateQuantity({ productId, quantity: newQuantity })).unwrap()
   }
 
   const handleDeleteItem = async (event: MouseEvent<HTMLButtonElement>): Promise<void> => {
     event.preventDefault()
-    if (isCartLoading) return
+
+    if (isCartLoading) {
+      return
+    }
+
     await dispatch(removeProduct({ productId, quantity })).unwrap()
   }
 
diff --git a/app/pages/cart/CartTopPanel.tsx b/app/pages/cart/CartTopPanel.tsx
index 4bd08e3..7b0f8c7 100644
--- a/app/pages/cart/CartTopPanel.tsx
+++ b/app/pages/cart/CartTopPanel.tsx
@@ -14,7 +14,12 @@ export function CartTopPanel({ onClearCart }: CartTopPanelProps): ReactElement {
   return (
     <Card className="w-full max-w-2xl">
       <CardContent className="flex justify-between items-center gap-2 flex-wrap">
-        {cart && <CartTotalPrice totalPrice={cart?.totalPrice?.centAmount} discount={cart?.discountOnTotalPrice} />}
+        {cart && (
+          <CartTotalPrice
+            priceAfterDiscount={cart?.totalPrice?.centAmount}
+            discountOnTotal={cart?.discountOnTotalPrice}
+          />
+        )}
         <ClearCartButton onClearCart={onClearCart} />
       </CardContent>
     </Card>
diff --git a/app/pages/cart/CartTotalPrice.tsx b/app/pages/cart/CartTotalPrice.tsx
index b9d826b..1801ed0 100644
--- a/app/pages/cart/CartTotalPrice.tsx
+++ b/app/pages/cart/CartTotalPrice.tsx
@@ -3,14 +3,14 @@ import type { ReactElement } from 'react'
 import { formatProductItemPrice } from '~/utils/formatPrice'
 
 type CartTotalPriceProps = {
-  totalPrice?: number
-  discount?: DiscountOnTotalPrice
+  priceAfterDiscount?: number
+  discountOnTotal?: DiscountOnTotalPrice
 }
 
-export function CartTotalPrice({ totalPrice, discount }: CartTotalPriceProps): ReactElement {
-  const hasDiscount = discount !== undefined
-  const fullPrice = (totalPrice ?? 0) + (discount?.discountedAmount?.centAmount ?? 0)
-  const discountedPrice = totalPrice ?? 0
+export function CartTotalPrice({ priceAfterDiscount, discountOnTotal }: CartTotalPriceProps): ReactElement {
+  const hasDiscount = discountOnTotal !== undefined
+  const fullPrice = (priceAfterDiscount ?? 0) + (discountOnTotal?.discountedAmount?.centAmount ?? 0)
+  const discountedPrice = priceAfterDiscount ?? 0
 
   return (
     <div className="text-center m-0 text-sm sm:text-base font-semibold justify-items-start">
diff --git a/app/pages/catalog/FilterForm/FilterFormBody.tsx b/app/pages/catalog/FilterForm/FilterFormBody.tsx
index 7f4f5a4..783dfb2 100644
--- a/app/pages/catalog/FilterForm/FilterFormBody.tsx
+++ b/app/pages/catalog/FilterForm/FilterFormBody.tsx
@@ -17,17 +17,17 @@ import {
 type FilterFormBodyProps = {
   filters: ProductListFilter[]
   categories: ProductListCategory[]
-  fetch: UseCatalogDataResult['fetchProducts']
+  fetchProducts: UseCatalogDataResult['fetchProducts']
   onApply: () => void
 }
 
-export function FilterFormBody({ filters, categories, fetch, onApply }: FilterFormBodyProps): ReactElement {
+export function FilterFormBody({ filters, categories, fetchProducts, onApply }: FilterFormBodyProps): ReactElement {
   const defaultValues = getDefaultFormValues(filters, sorts)
   const form = useForm<FormValues>({ defaultValues })
 
   const handleApply = (data: FormValues): Promise<void> => {
     onApply()
-    return fetch(
+    return fetchProducts(
       { limit: PRODUCT_LIST_ITEMS_PER_PAGE },
       convertFormValuesToAppliedFilters(data, filters),
       convertFormValuesToSort(data, sorts)
diff --git a/app/pages/catalog/PaginationControls.tsx b/app/pages/catalog/PaginationControls.tsx
index 11fbe54..503f646 100644
--- a/app/pages/catalog/PaginationControls.tsx
+++ b/app/pages/catalog/PaginationControls.tsx
@@ -18,6 +18,7 @@ type PaginationControlsProps = {
 export function PaginationControls({ page, totalPage, onPageChange }: PaginationControlsProps): ReactElement {
   const isFirstPage = page === 1
   const isLastPage = page === totalPage
+  const classNamesActive = 'cursor-pointer'
   const classNamesDisabled = 'pointer-events-none opacity-50'
 
   return (
@@ -26,13 +27,13 @@ export function PaginationControls({ page, totalPage, onPageChange }: Pagination
         <PaginationItem>
           <PaginationStart
             onClick={() => !isFirstPage && onPageChange(1)}
-            className={isFirstPage ? classNamesDisabled : ''}
+            className={isFirstPage ? classNamesDisabled : classNamesActive}
           />
         </PaginationItem>
         <PaginationItem>
           <PaginationPrevious
             onClick={() => !isFirstPage && onPageChange(page - 1)}
-            className={isFirstPage ? classNamesDisabled : ''}
+            className={isFirstPage ? classNamesDisabled : classNamesActive}
           />
         </PaginationItem>
         <PaginationItem className="px-2.5 sm:pl-2.5 border rounded-sm">
@@ -41,13 +42,13 @@ export function PaginationControls({ page, totalPage, onPageChange }: Pagination
         <PaginationItem>
           <PaginationNext
             onClick={() => !isLastPage && onPageChange(page + 1)}
-            className={isLastPage ? classNamesDisabled : ''}
+            className={isLastPage ? classNamesDisabled : classNamesActive}
           />
         </PaginationItem>
         <PaginationItem>
           <PaginationEnd
             onClick={() => !isLastPage && onPageChange(totalPage)}
-            className={isLastPage ? classNamesDisabled : ''}
+            className={isLastPage ? classNamesDisabled : classNamesActive}
           />
         </PaginationItem>
       </PaginationContent>
diff --git a/app/pages/catalog/SearchForm/SearchFormBody.tsx b/app/pages/catalog/SearchForm/SearchFormBody.tsx
index 374f638..510fbf2 100644
--- a/app/pages/catalog/SearchForm/SearchFormBody.tsx
+++ b/app/pages/catalog/SearchForm/SearchFormBody.tsx
@@ -7,19 +7,18 @@ import { type UseCatalogDataResult } from '../hooks/useCatalogData'
 import { PRODUCT_LIST_ITEMS_PER_PAGE } from '~/api/namespaces/product'
 
 type SearchFormBodyProps = {
-  fetch: UseCatalogDataResult['fetchProducts']
+  fetchProducts: UseCatalogDataResult['fetchProducts']
   setSearch: (search: string) => void
   onSearch: () => void
 }
 
-export function SearchFormBody({ fetch, setSearch, onSearch }: SearchFormBodyProps): ReactElement {
-  const { register, handleSubmit, getValues } = useForm<{ search: string }>()
+export function SearchFormBody({ fetchProducts, setSearch, onSearch }: SearchFormBodyProps): ReactElement {
+  const { register, handleSubmit } = useForm<{ search: string }>()
 
-  const onSubmit = (): Promise<void> => {
+  const onSubmit = (data: { search: string }): Promise<void> => {
     onSearch()
-    const { search } = getValues()
-    setSearch(search)
-    return fetch({ limit: PRODUCT_LIST_ITEMS_PER_PAGE }, [], [], search)
+    setSearch(data.search)
+    return fetchProducts({ limit: PRODUCT_LIST_ITEMS_PER_PAGE }, [], [], data.search)
   }
 
   return (
diff --git a/app/pages/catalog/index.tsx b/app/pages/catalog/index.tsx
index 2c8465d..611eb7d 100644
--- a/app/pages/catalog/index.tsx
+++ b/app/pages/catalog/index.tsx
@@ -29,12 +29,12 @@ export default function Catalog(): ReactElement {
       <FilterFormBody
         filters={data.filters}
         categories={data.categories}
-        fetch={data.fetchProducts}
+        fetchProducts={data.fetchProducts}
         onApply={data.resetCurrentPageAndSearchText}
       />
       <div className="flex-grow">
         <SearchFormBody
-          fetch={data.fetchProducts}
+          fetchProducts={data.fetchProducts}
           setSearch={data.setSearchText}
           onSearch={() => data.setCurrentPage(1)}
         />
diff --git a/app/pages/login/LoginForm/LoginFormBody.tsx b/app/pages/login/LoginForm/LoginFormBody.tsx
index 48a35b3..7250ea9 100644
--- a/app/pages/login/LoginForm/LoginFormBody.tsx
+++ b/app/pages/login/LoginForm/LoginFormBody.tsx
@@ -41,7 +41,7 @@ export const LoginFormBody = (): ReactElement => {
   useEffect(() => void dispatch(resetAuthError()), [dispatch])
 
   return (
-    <Card className="md:min-w-lg m-6">
+    <Card className="md:min-w-lg m-6 border-0 shadow-none">
       <CardHeader>
         <CardTitle>LOGIN</CardTitle>
       </CardHeader>
diff --git a/app/pages/product/hooks/useProductInfo.tsx b/app/pages/product/hooks/useProductInfo.tsx
index e273810..dbd015e 100644
--- a/app/pages/product/hooks/useProductInfo.tsx
+++ b/app/pages/product/hooks/useProductInfo.tsx
@@ -24,26 +24,29 @@ export function getBreadcrumbs(
 
     if (category.subCategories !== undefined && category.subCategories.length > 0) {
       const result = getBreadcrumbs(category.subCategories, categoryId, newBreadcrumbs)
-      if (result) return result
+
+      if (result.length > 0) {
+        return result
+      }
     }
   }
 
   return []
 }
 
-export function useProductInfo(product: ProductProjection, categories?: ProductListCategory[]): ProductInfoResult {
-  const name = product.name
-  const description = product.description ?? name
-  const price = product.masterVariant.prices?.[0]?.value?.centAmount ?? 0
-  const discount = product.masterVariant.prices?.[0]?.discounted?.value?.centAmount
-  const images = product.masterVariant.images ?? []
+export function useProductInfo(
+  { categories, description, masterVariant, name }: ProductProjection,
+  categoryList?: ProductListCategory[]
+): ProductInfoResult {
+  const price = masterVariant.prices?.[0]?.value?.centAmount ?? 0
+  const discount = masterVariant.prices?.[0]?.discounted?.value?.centAmount
+  const images = masterVariant.images ?? []
 
-  const breadcrumbs =
-    categories && product.categories?.[0]?.id ? getBreadcrumbs(categories, product.categories[0].id) : []
+  const breadcrumbs = categoryList && categories?.[0]?.id ? getBreadcrumbs(categoryList, categories[0].id) : []
 
   return {
     name,
-    description,
+    description: description ?? name,
     price,
     discount,
     images,
diff --git a/app/pages/profile/UserDetail/UserAddresses.tsx b/app/pages/profile/UserDetail/UserAddresses.tsx
index 8023b37..7aa9fc9 100644
--- a/app/pages/profile/UserDetail/UserAddresses.tsx
+++ b/app/pages/profile/UserDetail/UserAddresses.tsx
@@ -20,18 +20,18 @@ export const UserAddresses = ({ isEdit }: UserAddressesProps): ReactElement => {
         </CardHeader>
         <CardContent className="divide-y space-y-4">
           {addresses.map((address, index) => {
+            const key = address.id ?? String(index)
             const commonProps = {
               address,
               defaultBillingAddressId,
-              defaultShippingAddressId,
-              key: address.id ?? String(index)
+              defaultShippingAddressId
             }
 
             if (isEdit) {
-              return <UserAddressFormBody {...commonProps} />
+              return <UserAddressFormBody key={key} {...commonProps} />
             }
 
-            return <UserAddress {...commonProps} />
+            return <UserAddress key={key} {...commonProps} />
           })}
         </CardContent>
       </Card>
diff --git a/app/pages/profile/UserDetail/UserDetailEdit/UseAddressForm/UserAddressFormBody.tsx b/app/pages/profile/UserDetail/UserDetailEdit/UseAddressForm/UserAddressFormBody.tsx
index a114be0..576cf0d 100644
--- a/app/pages/profile/UserDetail/UserDetailEdit/UseAddressForm/UserAddressFormBody.tsx
+++ b/app/pages/profile/UserDetail/UserDetailEdit/UseAddressForm/UserAddressFormBody.tsx
@@ -26,9 +26,14 @@ type UserAddressFormBodyProps = {
   defaultShippingAddressId: string
 }
 
-const UserAddressFormBodyProvider = (props: UserAddressFormBodyProviderProps): ReactElement => {
-  const isBilling = props.address.id === props.defaultBillingAddressId
-  const isShipping = props.address.id === props.defaultShippingAddressId
+const UserAddressFormBodyProvider = ({
+  address,
+  defaultBillingAddressId,
+  defaultShippingAddressId,
+  form
+}: UserAddressFormBodyProviderProps): ReactElement => {
+  const isBilling = address.id === defaultBillingAddressId
+  const isShipping = address.id === defaultShippingAddressId
   const { status: changeAddressStatus, changeAddress } = useChangeAddress()
   const { removeAddress } = useRemoveAddress()
   const { setBillingAddress } = useSetBillingAddress()
@@ -36,7 +41,7 @@ const UserAddressFormBodyProvider = (props: UserAddressFormBodyProviderProps): R
 
   const handleChangeAddress = (payload: z.infer<typeof schema>): Promise<void> =>
     changeAddress({
-      ...props.address,
+      ...address,
       city: payload.city,
       country: payload.country,
       firstName: payload.firstName,
@@ -50,14 +55,14 @@ const UserAddressFormBodyProvider = (props: UserAddressFormBodyProviderProps): R
       <div className="flex gap-2 pb-2">
         {isBilling && <Badge>Default billing</Badge>} {isShipping && <Badge>Default shipping</Badge>}
       </div>
-      <Form {...props.form}>
-        <form onSubmit={(event) => void props.form.handleSubmit(handleChangeAddress)(event)} className="space-y-6">
+      <Form {...form}>
+        <form onSubmit={(event) => void form.handleSubmit(handleChangeAddress)(event)} className="space-y-6">
           <UserAddressFormFields
-            form={props.form}
+            form={form}
             status={changeAddressStatus}
-            onRemove={() => removeAddress(props.address.id)}
-            onSetAsBilling={() => setBillingAddress(props.address.id)}
-            onSetAsShipping={() => setShippingAddress(props.address.id)}
+            onRemove={() => removeAddress(address.id)}
+            onSetAsBilling={() => setBillingAddress(address.id)}
+            onSetAsShipping={() => setShippingAddress(address.id)}
           />
         </form>
       </Form>
diff --git a/app/pages/profile/UserDetail/UserDetailView/UserAddress.tsx b/app/pages/profile/UserDetail/UserDetailView/UserAddress.tsx
index 1ffe6c5..fc6e704 100644
--- a/app/pages/profile/UserDetail/UserDetailView/UserAddress.tsx
+++ b/app/pages/profile/UserDetail/UserDetailView/UserAddress.tsx
@@ -10,9 +10,13 @@ type UserAddressProps = {
   defaultShippingAddressId: string
 }
 
-export const UserAddress = (props: UserAddressProps): ReactElement => {
-  const isBilling = props.address.id === props.defaultBillingAddressId
-  const isShipping = props.address.id === props.defaultShippingAddressId
+export const UserAddress = ({
+  address,
+  defaultBillingAddressId,
+  defaultShippingAddressId
+}: UserAddressProps): ReactElement => {
+  const isBilling = address.id === defaultBillingAddressId
+  const isShipping = address.id === defaultShippingAddressId
 
   return (
     <div>
@@ -22,12 +26,12 @@ export const UserAddress = (props: UserAddressProps): ReactElement => {
       </div>
       <div className="grid gap-4 md:grid-cols-2 items-start">
         {[
-          { label: 'First Name', value: props.address.firstName },
-          { label: 'Last Name', value: props.address.lastName },
-          { label: 'Country', value: countries[props.address.country] },
-          { label: 'City', value: props.address.city },
-          { label: 'Street name', value: props.address.streetName },
-          { label: 'Postal code', value: props.address.postalCode }
+          { label: 'First Name', value: address.firstName },
+          { label: 'Last Name', value: address.lastName },
+          { label: 'Country', value: countries[address.country] },
+          { label: 'City', value: address.city },
+          { label: 'Street name', value: address.streetName },
+          { label: 'Postal code', value: address.postalCode }
         ].map((field) => (
           <UserAddressField label={field.label} value={field.value} key={field.label} />
         ))}
diff --git a/app/pages/register/RegisterForm/RegisterFormBody.tsx b/app/pages/register/RegisterForm/RegisterFormBody.tsx
index e2ef01c..ec934a0 100644
--- a/app/pages/register/RegisterForm/RegisterFormBody.tsx
+++ b/app/pages/register/RegisterForm/RegisterFormBody.tsx
@@ -57,7 +57,7 @@ export const RegisterFormBody = (): ReactElement => {
   useEffect(() => void dispatch(resetAuthError()), [dispatch])
 
   return (
-    <Card className="min-w-full border-0 m-6 shadow-none">
+    <Card className="w-[1280px] max-w-full border-0 my-6 px-2 shadow-none">
       <RegisterFormHeader />
       <Form {...form}>
         <form onSubmit={(event) => void form.handleSubmit(handleRegister)(event)} className="space-y-6">
diff --git a/eslint.config.mts b/eslint.config.mts
index cf58f2c..225eecc 100644
--- a/eslint.config.mts
+++ b/eslint.config.mts
@@ -47,7 +47,7 @@ const rules = {
       }
     }
   ],
-  'max-lines-per-function': ['error', 40],
+  'max-lines-per-function': ['error', 45],
   'no-restricted-imports': [
     2,
     {