diff --git a/apps/server/src/database/prisma/mappers/prisma-expiration-date-notification-mapper.ts b/apps/server/src/database/prisma/mappers/prisma-expiration-date-notification-mapper.ts
index 79aaef77..e747dd79 100644
--- a/apps/server/src/database/prisma/mappers/prisma-expiration-date-notification-mapper.ts
+++ b/apps/server/src/database/prisma/mappers/prisma-expiration-date-notification-mapper.ts
@@ -1,16 +1,16 @@
 import { ExpirationDateNotification } from '@stocker/core/entities'
 import type { PrismaExpirationDateNotification } from '../types'
+import { PrismaBatchesMapper } from './prisma-batches-mapper'
 
 export class PrismaExpirationDateNotificationMapper {
   toDomain(
     prismaExpirationDateNotification: PrismaExpirationDateNotification,
   ): ExpirationDateNotification {
+    const batchMapper = new PrismaBatchesMapper()
+
     return ExpirationDateNotification.create({
       id: prismaExpirationDateNotification.id,
-      batch: {
-        id: prismaExpirationDateNotification.batch_id,
-        code: prismaExpirationDateNotification.Batch.code,
-      },
+      batchDto: batchMapper.toDomain(prismaExpirationDateNotification.batch).dto,
       sentAt: prismaExpirationDateNotification.registered_at,
       companyId: prismaExpirationDateNotification.company_id,
     })
@@ -19,14 +19,13 @@ export class PrismaExpirationDateNotificationMapper {
   toPrisma(
     expirationDateNotification: ExpirationDateNotification,
   ): PrismaExpirationDateNotification {
+    const batchMapper = new PrismaBatchesMapper()
+
     return {
       id: expirationDateNotification.id,
       registered_at: expirationDateNotification.sentAt,
       batch_id: expirationDateNotification.batch.id,
-      Batch: {
-        id: expirationDateNotification.batch.id,
-        code: expirationDateNotification.batch.code,
-      },
+      batch: batchMapper.toPrisma(expirationDateNotification.batch),
       company_id: expirationDateNotification.companyId,
     }
   }
diff --git a/apps/web/src/ui/components/pages/profile/employees-cards/index.tsx b/apps/web/src/ui/components/pages/profile/employees-cards/index.tsx
index 766b20e4..7ce7f47f 100644
--- a/apps/web/src/ui/components/pages/profile/employees-cards/index.tsx
+++ b/apps/web/src/ui/components/pages/profile/employees-cards/index.tsx
@@ -14,13 +14,13 @@ export const EmployeesCards = async () => {
       <Card
         title='Funcionários'
         value={response.body.employeesCount}
-        href='/records/employees'
+        href='/records/employees?role=employee'
         icon='user'
       />
       <Card
         title='Gerentes'
         value={response.body.managersCount}
-        href='/records/employees'
+        href='/records/employees?role=manager'
         icon='user'
       />
     </div>
diff --git a/apps/web/src/ui/components/pages/profile/roles-control/index.tsx b/apps/web/src/ui/components/pages/profile/roles-control/index.tsx
index 36c3b5a8..90cf2a7f 100644
--- a/apps/web/src/ui/components/pages/profile/roles-control/index.tsx
+++ b/apps/web/src/ui/components/pages/profile/roles-control/index.tsx
@@ -44,7 +44,7 @@ export const RolesControl = ({ roles, companyId }: RolesControlProps) => {
       <h2 className='text-2xl text-zinc-800 font-bold'>Controle de permissões</h2>
       <h3 className='text-xl text-zinc-800 mt-3 font-medium'>Gerente</h3>
       <Divider className='mt-3' />
-      <div className='grid grid-cols-4 gap-3 mt-3'>
+      <div className='grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4 lg:gap-3 mt-3'>
         {Object.keys(ROLE_PERMISSIONS).map((permission) => (
           <Switch
             key={permission}
@@ -61,7 +61,7 @@ export const RolesControl = ({ roles, companyId }: RolesControlProps) => {
       </div>
       <h3 className='text-xl text-zinc-800 mt-6 font-medium'>Funcionário</h3>
       <Divider className='mt-3' />
-      <div className='grid grid-cols-4 gap-3 mt-3'>
+      <div className='grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4 lg:gap-3 mt-3'>
         {Object.keys(ROLE_PERMISSIONS).map((permission) => (
           <Switch
             key={permission}
diff --git a/packages/core/src/use-cases/categories/register-category-use-case.ts b/packages/core/src/use-cases/categories/register-category-use-case.ts
index a5bd2235..e463b3a8 100644
--- a/packages/core/src/use-cases/categories/register-category-use-case.ts
+++ b/packages/core/src/use-cases/categories/register-category-use-case.ts
@@ -1,6 +1,5 @@
 import { Category } from '../../domain/entities/category'
 import type { CategoryDto } from '../../dtos'
-import { ConflictError } from '../../errors'
 import type { ICategoriesRepository } from '../../interfaces/repositories/categories-repository'
 
 type Request = {