diff --git a/src/pages/strom/akcie/[[...params]].tsx b/src/pages/strom/akcie/[[...params]].tsx
index f2accbc3..c515fb43 100644
--- a/src/pages/strom/akcie/[[...params]].tsx
+++ b/src/pages/strom/akcie/[[...params]].tsx
@@ -29,33 +29,72 @@ const StaticPage: NextPage<CompetitionPageProps> = ({competition, is_rules}) =>
           {competition.who_can_participate && <p>Pre koho? {competition.who_can_participate}</p>}
           <p>{competition.description}</p>
         </div>
-        {competition.rules && (
-          <div className={styles.container}>
-            <div className={styles.actions}>
+        <div className={styles.mainText}>
+          {competition.upcoming_or_current_event ? (
+            <div className={styles.mainText}>
+              <p>
+                <b>Nadchádzajúci ročník:</b>
+              </p>
+              {competition.upcoming_or_current_event.start && (
+                <p>Odkedy? {competition.upcoming_or_current_event.start} </p>
+              )}
+              {competition.upcoming_or_current_event.end && <p>Dokedy? {competition.upcoming_or_current_event.end}</p>}
+              {competition.upcoming_or_current_event.publication_set.length > 0 && (
+                <p>
+                  <Link href={`/api/${competition.upcoming_or_current_event.publication_set[0].file}`}>Pozvánka</Link>
+                </p>
+              )}
+              {competition.upcoming_or_current_event.registration_link && (
+                <div>
+                  <p>
+                    Registrácia prebieha do:
+                    {competition.upcoming_or_current_event.registration_link.end}
+                    <Link href={competition.upcoming_or_current_event.registration_link.url}>Registračný formulár</Link>
+                  </p>
+
+                  <p>{competition.upcoming_or_current_event.registration_link.additional_info}</p>
+                </div>
+              )}
+            </div>
+          ) : (
+            <p>
+              <b>Nadchádzajúci ročník:</b> Pripravujeme
+            </p>
+          )}
+        </div>
+
+        <div className={styles.container}>
+          <div className={styles.actions}>
+            <div className={styles.actionButton}>
               <RulesLink />
             </div>
           </div>
-        )}
+        </div>
+
         <div className={styles.h2}>
           <h2>Archív: </h2>
         </div>
         {competition.competition_type.name === 'Tábor' ? (
-          <div className={styles.archiveCamp}>
+          <div className={styles.archiveWithoutPublications}>
             {competition.history_events.map((event) => (
-              <div key={event.id}>
-                {competition.name} {event.school_year}
-              </div>
+              <Fragment key={event.id}>
+                <div>
+                  {competition.name + ' '} {event.school_year}
+                </div>
+              </Fragment>
             ))}
           </div>
         ) : (
-          <div className={styles.archive}>
+          <div className={styles.archiveWithPublications}>
             {competition.history_events.map((event) => (
               <Fragment key={event.id}>
                 <div>
                   {competition.name} {event.school_year}
                 </div>
                 {event.publication_set.map((publication) => (
-                  <div key={publication.id}> {publication.name}</div>
+                  <Link key={publication.id} href={`/api/${publication.file}`}>
+                    {publication.name}
+                  </Link>
                 ))}
               </Fragment>
             ))}
diff --git a/src/pages/strom/akcie/competition.module.scss b/src/pages/strom/akcie/competition.module.scss
index 6a44d84d..fdf921d4 100644
--- a/src/pages/strom/akcie/competition.module.scss
+++ b/src/pages/strom/akcie/competition.module.scss
@@ -39,7 +39,7 @@
     }
   }
 
-  .archive{
+  .archiveWithPublications{
     display: grid;
     width: 50%;
     grid-template-columns: 1fr max-content max-content;
@@ -60,7 +60,7 @@
     }
   }
 
-  .archiveCamp{
+  .archiveWithoutPublications{
     font-weight: bold;
     text-transform: uppercase;
     margin-top: 10px;
diff --git a/src/pages/strom/akcie/competition.module.scss.d.ts b/src/pages/strom/akcie/competition.module.scss.d.ts
index 350e5f5a..0409c32b 100644
--- a/src/pages/strom/akcie/competition.module.scss.d.ts
+++ b/src/pages/strom/akcie/competition.module.scss.d.ts
@@ -1,8 +1,8 @@
 export type Styles = {
   actionButton: string
   actions: string
-  archive: string
-  archiveCamp: string
+  archiveWithoutPublications: string
+  archiveWithPublications: string
   commentActions: string
   container: string
   disabled: string