diff --git a/tournaments/migrations/0018_rename_date_event_creation_date_and_more.py b/tournaments/migrations/0018_rename_date_event_creation_date_and_more.py
new file mode 100644
index 0000000..2f71411
--- /dev/null
+++ b/tournaments/migrations/0018_rename_date_event_creation_date_and_more.py
@@ -0,0 +1,78 @@
+# Generated by Django 4.2.11 on 2024-03-11 17:34
+
+from django.db import migrations, models
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tournaments', '0017_alter_match_court'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='event',
+            old_name='date',
+            new_name='creation_date',
+        ),
+        migrations.RemoveField(
+            model_name='tournament',
+            name='format',
+        ),
+        migrations.AlterField(
+            model_name='club',
+            name='id',
+            field=models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False),
+        ),
+        migrations.AlterField(
+            model_name='customuser',
+            name='id',
+            field=models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False),
+        ),
+        migrations.AlterField(
+            model_name='event',
+            name='id',
+            field=models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False),
+        ),
+        migrations.AlterField(
+            model_name='event',
+            name='tenup_id',
+            field=models.CharField(blank=True, max_length=20, null=True),
+        ),
+        migrations.AlterField(
+            model_name='groupstage',
+            name='id',
+            field=models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False),
+        ),
+        migrations.AlterField(
+            model_name='match',
+            name='id',
+            field=models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False),
+        ),
+        migrations.AlterField(
+            model_name='playerregistration',
+            name='id',
+            field=models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False),
+        ),
+        migrations.AlterField(
+            model_name='round',
+            name='id',
+            field=models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False),
+        ),
+        migrations.AlterField(
+            model_name='teamregistration',
+            name='id',
+            field=models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False),
+        ),
+        migrations.AlterField(
+            model_name='teamscore',
+            name='id',
+            field=models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False),
+        ),
+        migrations.AlterField(
+            model_name='tournament',
+            name='id',
+            field=models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False),
+        ),
+    ]
diff --git a/tournaments/models/event.py b/tournaments/models/event.py
index 03eb76d..7172e1a 100644
--- a/tournaments/models/event.py
+++ b/tournaments/models/event.py
@@ -5,11 +5,11 @@ import uuid
 class Event(models.Model):
     id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=True)
     club = models.ForeignKey(Club, on_delete=models.CASCADE)
-    date = models.DateTimeField()
+    creation_date = models.DateTimeField()
     name = models.CharField(max_length=200, null=True, blank=True)
     federal_tournament_data = models.JSONField(null=True, blank=True)
     court_count = models.IntegerField(null=True, blank=True)
-    tenup_id = models.IntegerField(null=True, blank=True)
+    tenup_id = models.CharField(max_length=20, null=True, blank=True)
     group_stage_format = models.IntegerField(default=FederalMatchCategory.NINE_GAMES, choices=FederalMatchCategory.choices, null=True, blank=True)
     round_format = models.IntegerField(default=FederalMatchCategory.NINE_GAMES, choices=FederalMatchCategory.choices, null=True, blank=True)
     loser_round_format = models.IntegerField(default=FederalMatchCategory.NINE_GAMES, choices=FederalMatchCategory.choices, null=True, blank=True)
diff --git a/tournaments/models/tournament.py b/tournaments/models/tournament.py
index 3b2e974..657cb40 100644
--- a/tournaments/models/tournament.py
+++ b/tournaments/models/tournament.py
@@ -11,9 +11,9 @@ class Tournament(models.Model):
     end_date = models.DateTimeField(null=True, blank=True)
     creation_date = models.DateTimeField()
     is_private = models.BooleanField()
-    format = models.IntegerField(default=FederalMatchCategory.NINE_GAMES, choices=FederalMatchCategory.choices, null=True, blank=True)
-    group_stage_format = models.IntegerField(default=FederalMatchCategory.NINE_GAMES, choices=FederalMatchCategory.choices, null=True, blank=True)
+    # format = models.IntegerField(default=FederalMatchCategory.NINE_GAMES, choices=FederalMatchCategory.choices, null=True, blank=True)
     round_format = models.IntegerField(default=FederalMatchCategory.NINE_GAMES, choices=FederalMatchCategory.choices, null=True, blank=True)
+    group_stage_format = models.IntegerField(default=FederalMatchCategory.NINE_GAMES, choices=FederalMatchCategory.choices, null=True, blank=True)
     loser_round_format = models.IntegerField(default=FederalMatchCategory.NINE_GAMES, choices=FederalMatchCategory.choices, null=True, blank=True)
     bracket_sort_mode = models.IntegerField(default=0)
     group_stage_count = models.IntegerField(default=0)
diff --git a/tournaments/static/tournaments/css/style.css b/tournaments/static/tournaments/css/style.css
index 6bbb5a0..1cd7baf 100644
--- a/tournaments/static/tournaments/css/style.css
+++ b/tournaments/static/tournaments/css/style.css
@@ -48,10 +48,6 @@ header {
     font-size: 20px;
 }
 
-/* .page-body {
-    flex-grow: 1;
-} */
-
 a {
     color: #707070;
 }
@@ -69,6 +65,11 @@ a:hover {
     font-weight: 600;
 } */
 
+.container {
+    /* width: 100%; */
+    /* text-align:center; */
+}
+
 .wrapper {
     margin: 0px 10px;
 }
@@ -332,11 +333,6 @@ tr {
     align-items: center;
 }
 
-.container {
-    width: 100%;
-    /* text-align:center; */
-}
-
 .verticalmargin {
     margin: 10px 0px;
 }
diff --git a/tournaments/templates/tournaments/base.html b/tournaments/templates/tournaments/base.html
index d3c502e..443ff28 100644
--- a/tournaments/templates/tournaments/base.html
+++ b/tournaments/templates/tournaments/base.html
@@ -20,32 +20,31 @@
 
     </head>
 
-    <body>
-        <div class="wrapper">
-            <main class="page-body">
-                <div class="container">
-
-                    <div class="grid-x">
-                        <div class="cell medium-6 large-6 topblock my-block">
-                            <!-- <div class="bubble"> -->
-                                <img
-                                    src="{% static 'tournaments/images/PadelClub_logo_512.png' %}"
-                                    class="logo inline"
-                                />
-                                <div class="inline">
-                                    <h1 class="club">{% block first_title %}Page Title{% endblock %}</h1>
-                                    <h1 class="event">{% block second_title %}Page Title{% endblock %}</h1>
-                                    <!-- <span>Propulsé par Padel Club</span> -->
-                                </div>
-                            <!-- </div> -->
-                        </div>
+    <body class="wrapper">
+            <header>
+                <div class="grid-x">
+                    <div class="cell medium-6 large-6 topblock my-block">
+                        <!-- <div class="bubble"> -->
+                            <img
+                                src="{% static 'tournaments/images/PadelClub_logo_512.png' %}"
+                                class="logo inline"
+                            />
+                            <div class="inline">
+                                <h1 class="club">{% block first_title %}Page Title{% endblock %}</h1>
+                                <h1 class="event">{% block second_title %}Page Title{% endblock %}</h1>
+                                <!-- <span>Propulsé par Padel Club</span> -->
+                            </div>
+                        <!-- </div> -->
                     </div>
-                    <!-- Content -->
-                    {% block content %}
-                    <!-- The content of child templates will be inserted here -->
-                    {% endblock %}
                 </div>
+            </header>
+
+            <main>
+            <!-- Content -->
+            {% block content %}
+            <!-- The content of child templates will be inserted here -->
+            {% endblock %}
             </main>
-        </div>
+
     </body>
 </html>