diff --git a/dsst/dsst_gtk3/dialogs.py b/dsst/dsst_gtk3/dialogs.py
index a57aa26..e0a8f16 100644
--- a/dsst/dsst_gtk3/dialogs.py
+++ b/dsst/dsst_gtk3/dialogs.py
@@ -74,10 +74,10 @@ def show_episode_dialog(builder: Gtk.Builder, title: str, season_id: int, episod
         # Update Date of the Episode
         cal_value = builder.get_object('episode_calendar').get_date()
         selected_date = datetime(*cal_value).date()
-        query = sql.Episode.update(date=selected_date,
-                                   number=int(builder.get_object("episode_no_spin_button").get_value()))\
-                           .where(sql.Episode.id == episode.id)
-        query.execute()
+        episode.update(date=selected_date,
+                       number=str(builder.get_object("episode_no_spin_button").get_value()),
+                       name=builder.get_object("episode_name_entry").get_text())\
+                .execute()
         return True
 
 
diff --git a/dsst/dsst_gtk3/gtk_ui.py b/dsst/dsst_gtk3/gtk_ui.py
index d505647..83804cf 100644
--- a/dsst/dsst_gtk3/gtk_ui.py
+++ b/dsst/dsst_gtk3/gtk_ui.py
@@ -60,7 +60,7 @@ class GtkUi:
         model, selected_paths = selection.get_selected_rows()
         model.clear()
         for episode in sql_func.get_episodes_for_season(season_id):
-            model.append([episode.id, episode.number, str(episode.date)])
+            model.append([episode.id, episode.name, str(episode.date), episode.number])
         if selected_paths:
             selection.select_path(selected_paths[0])
         selection.handler_unblock_by_func(self.handlers.on_selected_episode_changed)
diff --git a/dsst/dsst_gtk3/resources/glade/window.glade b/dsst/dsst_gtk3/resources/glade/window.glade
index 27e8874..31589aa 100644
--- a/dsst/dsst_gtk3/resources/glade/window.glade
+++ b/dsst/dsst_gtk3/resources/glade/window.glade
@@ -183,28 +183,6 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkListStore" id="episode_deaths_store">
-    <columns>
-      <!-- column-name id -->
-      <column type="gint"/>
-      <!-- column-name player_name -->
-      <column type="gchararray"/>
-      <!-- column-name enemy_name -->
-      <column type="gchararray"/>
-      <!-- column-name penalty_name -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkListStore" id="episode_players_store">
-    <columns>
-      <!-- column-name id -->
-      <column type="gint"/>
-      <!-- column-name name -->
-      <column type="gchararray"/>
-      <!-- column-name hex_id -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
   <object class="GtkDialog" id="edit_episode_dialog">
     <property name="can_focus">False</property>
     <property name="resizable">False</property>
@@ -307,6 +285,41 @@
                     <property name="position">0</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkBox">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Episode Name</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="episode_name_entry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="pack_type">end</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
                 <child>
                   <object class="GtkBox">
                     <property name="visible">True</property>
@@ -362,46 +375,53 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">1</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkTreeView" id="episode_players_tree_view">
+                  <object class="GtkScrolledWindow">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="vexpand">True</property>
-                    <property name="model">episode_players_store</property>
-                    <property name="search_column">0</property>
-                    <child internal-child="selection">
-                      <object class="GtkTreeSelection"/>
-                    </child>
+                    <property name="shadow_type">in</property>
                     <child>
-                      <object class="GtkTreeViewColumn">
-                        <property name="title" translatable="yes">Name</property>
-                        <child>
-                          <object class="GtkCellRendererText"/>
-                          <attributes>
-                            <attribute name="text">1</attribute>
-                          </attributes>
+                      <object class="GtkTreeView" id="episode_players_tree_view">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="vexpand">True</property>
+                        <property name="model">episode_players_store</property>
+                        <property name="search_column">0</property>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection"/>
                         </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkTreeViewColumn">
-                        <property name="title" translatable="yes">Hex ID</property>
                         <child>
-                          <object class="GtkCellRendererText"/>
-                          <attributes>
-                            <attribute name="text">2</attribute>
-                          </attributes>
+                          <object class="GtkTreeViewColumn">
+                            <property name="title" translatable="yes">Name</property>
+                            <child>
+                              <object class="GtkCellRendererText"/>
+                              <attributes>
+                                <attribute name="text">1</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn">
+                            <property name="title" translatable="yes">Hex ID</property>
+                            <child>
+                              <object class="GtkCellRendererText"/>
+                              <attributes>
+                                <attribute name="text">2</attribute>
+                              </attributes>
+                            </child>
+                          </object>
                         </child>
                       </object>
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
+                    <property name="expand">True</property>
                     <property name="fill">True</property>
-                    <property name="position">2</property>
+                    <property name="position">3</property>
                   </packing>
                 </child>
               </object>
@@ -469,6 +489,28 @@
       <placeholder/>
     </child>
   </object>
+  <object class="GtkListStore" id="episode_deaths_store">
+    <columns>
+      <!-- column-name id -->
+      <column type="gint"/>
+      <!-- column-name player_name -->
+      <column type="gchararray"/>
+      <!-- column-name enemy_name -->
+      <column type="gchararray"/>
+      <!-- column-name penalty_name -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkListStore" id="episode_players_store">
+    <columns>
+      <!-- column-name id -->
+      <column type="gint"/>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+      <!-- column-name hex_id -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
   <object class="GtkListStore" id="episode_victories_store"/>
   <object class="GtkListStore" id="episodes_store">
     <columns>
@@ -478,6 +520,8 @@
       <column type="gchararray"/>
       <!-- column-name date -->
       <column type="gchararray"/>
+      <!-- column-name number -->
+      <column type="gchararray"/>
     </columns>
   </object>
   <object class="GtkDialog" id="manage_drinks_dialog">
@@ -1460,6 +1504,9 @@
                             <property name="title" translatable="yes">Episode</property>
                             <child>
                               <object class="GtkCellRendererText"/>
+                              <attributes>
+                                <attribute name="text">1</attribute>
+                              </attributes>
                             </child>
                           </object>
                         </child>
diff --git a/dsst/dsst_sql/sql.py b/dsst/dsst_sql/sql.py
index 4ec9a69..3031c50 100644
--- a/dsst/dsst_sql/sql.py
+++ b/dsst/dsst_sql/sql.py
@@ -35,6 +35,7 @@ class Episode(Model):
     id = AutoField()
     seq_number = IntegerField()
     number = CharField()
+    name = CharField(null=True)
     date = DateField(null=True)
     season = ForeignKeyField(Season, backref='episodes')
     players = ManyToManyField(Player, backref='episodes')