diff --git a/src/components/Admin/resources/competition/competition/CompetitionList.tsx b/src/components/Admin/resources/competition/competition/CompetitionList.tsx
index 0a0d17bd..7f05301e 100644
--- a/src/components/Admin/resources/competition/competition/CompetitionList.tsx
+++ b/src/components/Admin/resources/competition/competition/CompetitionList.tsx
@@ -9,7 +9,7 @@ export const CompetitionList: FC = () => (
     <Datagrid rowClick="show">
       <TextField source="name" />
       <TextField source="slug" />
-      <NumberField source="start_year" />
+      <TextField source="start_year" />
       <TruncatedTextField source="description" maxTextWidth={30} />
       <TruncatedTextField source="rules" maxTextWidth={30} />
       <TextField source="competition_type.name" label="Competition type" />
diff --git a/src/components/Admin/resources/competition/competition/CompetitionShow.tsx b/src/components/Admin/resources/competition/competition/CompetitionShow.tsx
index a690a0f0..7ea13155 100644
--- a/src/components/Admin/resources/competition/competition/CompetitionShow.tsx
+++ b/src/components/Admin/resources/competition/competition/CompetitionShow.tsx
@@ -1,12 +1,9 @@
-import {Divider} from '@mui/material'
 import {FC} from 'react'
 import {
   ArrayField,
   Datagrid,
   DateField,
-  FunctionField,
   NumberField,
-  RaRecord,
   Show,
   SimpleShowLayout,
   Tab,
@@ -14,12 +11,11 @@ import {
   TextField,
 } from 'react-admin'
 
+import {JsonField} from '@/components/Admin/custom/JsonField'
 import {MyShowActions} from '@/components/Admin/custom/MyShowActions'
 import {SitesArrayField} from '@/components/Admin/custom/SitesArrayField'
 import {TruncatedTextField} from '@/components/Admin/custom/TruncatedTextField'
 
-import {UpcomingOrCurrentEvent} from './UpcomingOrCurrentEvent'
-
 export const CompetitionShow: FC = () => (
   <Show actions={<MyShowActions />}>
     <TabbedShowLayout>
@@ -27,32 +23,27 @@ export const CompetitionShow: FC = () => (
         <SimpleShowLayout>
           <TextField source="name" />
           <TextField source="slug" />
-          <NumberField source="start_year" />
+          <TextField source="start_year" />
           <TruncatedTextField source="description" maxTextWidth={100} expandable />
           <TruncatedTextField source="rules" maxTextWidth={200} expandable />
-          <TextField source="competition_type.name" label="Competition type" />
+          <NumberField source="competition_type.id" />
+          <TextField source="competition_type.name" />
           <SitesArrayField source="sites" />
-          <TextField source="who_can_participate" />
           <NumberField source="min_years_until_graduation" />
-
-          <Divider />
-          <UpcomingOrCurrentEvent />
+          <TextField source="who_can_participate" />
+          <JsonField source="upcoming_or_current_event" />
         </SimpleShowLayout>
       </Tab>
       <Tab label="history_events">
         <SimpleShowLayout>
           <ArrayField source="history_events">
-            <Datagrid rowClick={(id) => `/competition/event/${id}/show`}>
+            <Datagrid>
               <NumberField source="year" />
-              <NumberField source="season_code" />
               <TextField source="school_year" />
               <DateField source="start" />
               <DateField source="end" />
-              <FunctionField<RaRecord>
-                source="publication_set"
-                label="Publication count"
-                render={(record) => record && <span>{record['publication_set'].length}</span>}
-              />
+              <NumberField source="season_code" />
+              <NumberField source="competition" />
             </Datagrid>
           </ArrayField>
         </SimpleShowLayout>