[longomatch/newui: 15/50] Start with new projects panel design



commit 51288728dc1985df8ca6989c1b03c4bd4fbc95c6
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Mon Aug 18 19:19:53 2014 +0200

    Start with new projects panel design

 LongoMatch.Core/Common/Constants.cs                |    1 +
 LongoMatch.Core/StyleConf.cs                       |   60 +-
 LongoMatch.GUI/Gui/Component/CodingWidget.cs       |    7 -
 LongoMatch.GUI/Gui/Component/TeamTemplateEditor.cs |   13 +-
 LongoMatch.GUI/Gui/MainWindow.cs                   |    5 +-
 LongoMatch.GUI/Gui/Panel/NewProjectPanel.cs        |  127 +-
 LongoMatch.GUI/Gui/Panel/SportsTemplatesPanel.cs   |    2 +-
 LongoMatch.GUI/Gui/Panel/TeamsTemplatesPanel.cs    |   13 +-
 LongoMatch.GUI/Gui/Panel/WelcomePanel.cs           |   55 +-
 LongoMatch.GUI/LongoMatch.GUI.mdp                  |    7 +-
 LongoMatch.GUI/Makefile.am                         |    4 +-
 .../LongoMatch.Gui.Component.CodingWidget.cs       |    4 +-
 .../LongoMatch.Gui.Component.Stats.Plotter.cs      |    1 +
 .../LongoMatch.Gui.Component.TeamTemplateEditor.cs |  387 ++---
 .../gtk-gui/LongoMatch.Gui.MainWindow.cs           |   12 +-
 .../LongoMatch.Gui.Panel.NewProjectPanel.cs        | 1115 +++++-------
 LongoMatch.GUI/gtk-gui/gui.stetic                  | 1778 +++++++++-----------
 LongoMatch.GUI/gtk-gui/objects.xml                 |   16 +
 LongoMatch.Migration/Makefile.am                   |    8 +-
 LongoMatch.Services/Services/Core.cs               |   11 -
 design/ui/player-card.jpg                          |  Bin 0 -> 83930 bytes
 design/ui/project-properties.jpg                   |  Bin 0 -> 179228 bytes
 22 files changed, 1636 insertions(+), 1990 deletions(-)
---
diff --git a/LongoMatch.Core/Common/Constants.cs b/LongoMatch.Core/Common/Constants.cs
index bd0b8d8..1f2e137 100644
--- a/LongoMatch.Core/Common/Constants.cs
+++ b/LongoMatch.Core/Common/Constants.cs
@@ -96,6 +96,7 @@ Xavier Queralt Mateu (ca)";
                public const string PLAYLIST_EXT = ".lpl";
                public const string PROJECT_EXT = ".lgm";
                
+               public const string LOGO_ICON = "longomatch";
                public const string BACKGROUND = "background.png";
                public const string FIELD_BACKGROUND = "field_background.svg";
                public const string HALF_FIELD_BACKGROUND = "half_field_background.svg";
diff --git a/LongoMatch.Core/StyleConf.cs b/LongoMatch.Core/StyleConf.cs
index 5301d30..21b69ae 100644
--- a/LongoMatch.Core/StyleConf.cs
+++ b/LongoMatch.Core/StyleConf.cs
@@ -21,29 +21,61 @@ namespace LongoMatch.Common
 {
        public class StyleConf
        {
-               public int WelcomeBorder { get; set; }
+               public const int WelcomeBorder = 30;
+               public const int WelcomeIconSize = 80;
+               public const int WelcomeLogoWidth = 450;
+               public const int WelcomeLogoHeight = 99;
+               public const int WelcomeIconsHSpacing = 105;
+               public const int WelcomeIconsVSpacing = 55;
+               public const int WelcomeIconsTextSpacing = 5;
+               public const int WelcomeIconsTextHeight = 20;
+               public const int WelcomeIconsPerRow = 3;
+               public const int WelcomeTextHeight = 20;
+               public const int WelcomeMinWidthBorder = 30;
+               public const int NewHeaderHeight = 60;
+               public const int NewHeaderSpacing = 10;
+               public const int NewEntryWidth = 150;
+               public const int NewEntryHeight = 30;
+               public const int NewTableHSpacing = 5;
+               public const int NewTableVSpacing = 5;
+               public const int NewTeamsComboWidth = 245;
+               public const int NewTeamsComboHeight = 60;
+               public const int NewTeamsIconSize = 55;
+               public const string NewTeamsFont = "Ubuntu 16";
+               public static Color NewTeamsFontColor = Color.White;
+               public const int NewTeamsSpacing = 60;
+               public const int NewTaggerSpacing = 35;
+               
+               public int BenchLineWidth = 2;
+               public int TeamTaggerBenchBorder = 10;
+               
+               public int PlayerSize = 60;
+               public int PlayerBorder = 2;
+               public int PlayerRadius = 2;
+               public int PlayerTeamLineWidth = 2;
+               public int PlayerNumberHeight  = 17;
+               public int PlayerNumberWidth  = 26;
+               public int PlayerNumberOffset  = 17;
+               public int PlayerArrowOffset = 14; 
+               public int PlayerArrowSize = 20; 
 
-               public int WelcomeIconSize { get; set; }
+               public Color HomeTeamColor { get; set; }
 
-               public int WelcomeLogoWidth { get; set; }
+               public Color AwayTeamColor { get; set; }
 
-               public int WelcomeLogoHeight { get; set; }
+               public Color PaletteBackground { get; set; }
 
-               public int WelcomeIconsHSpacing { get; set; }
+               public Color PaletteBackgroundLight { get; set; }
 
-               public int WelcomeIconsVSpacing { get; set; }
+               public Color PaletteBackgroundDark { get; set; }
 
-               public int WelcomeIconsTextSpacing { get; set; }
+               public Color PaletteWidgets { get; set; }
 
-               public int WelcomeIconsTextHeight { get; set; }
+               public Color PaletteSelected { get; set; }
 
-               public int WelcomeIconsPerRow { get; set; }
+               public Color PaletteActive { get; set; }
 
-               public int WelcomeTextHeight { get; set; }
-
-               public int WelcomeMinWidthBorder { get; set; }
-
-               public int TeamsComboColorHeight { get; set; }
+               public Color PaletteTool { get; set; }
 
                public static StyleConf Load (string filename)
                {
diff --git a/LongoMatch.GUI/Gui/Component/CodingWidget.cs b/LongoMatch.GUI/Gui/Component/CodingWidget.cs
index 85f062d..4d29fba 100644
--- a/LongoMatch.GUI/Gui/Component/CodingWidget.cs
+++ b/LongoMatch.GUI/Gui/Component/CodingWidget.cs
@@ -48,8 +48,6 @@ namespace LongoMatch.Gui.Component
                        autoTaggingMode.Active = true;
                        
                        teamtagger = new TeamTagger (new WidgetWrapper (teamsdrawingarea));
-                       teamtagger.HomeColor = Constants.HOME_COLOR;
-                       teamtagger.AwayColor = Constants.AWAY_COLOR;
                        teamtagger.SelectionMode = MultiSelectionMode.Multiple;
                        teamtagger.PlayersSelectionChangedEvent += HandlePlayersSelectionChangedEvent;
 
@@ -130,11 +128,6 @@ namespace LongoMatch.Gui.Component
                {
                        loadedPlay = play;
                        timeline.SelectedTimeNode = play;
-                       if (play != null) {
-                               teamtagger.Select (play.Players);
-                       } else {
-                               teamtagger.ClearSelection ();
-                       }
                }
 
                void HandleTick (Time currentTime)
diff --git a/LongoMatch.GUI/Gui/Component/TeamTemplateEditor.cs 
b/LongoMatch.GUI/Gui/Component/TeamTemplateEditor.cs
index 03258e8..db8e4a6 100644
--- a/LongoMatch.GUI/Gui/Component/TeamTemplateEditor.cs
+++ b/LongoMatch.GUI/Gui/Component/TeamTemplateEditor.cs
@@ -66,12 +66,13 @@ namespace LongoMatch.Gui.Component
                public TeamTemplate  Team {
                        set {
                                template = value;
-                               subsbutton.Active = false;
                                ignoreChanges = true;
                                if (template.Shield != null) {
                                        shieldimage.Pixbuf = template.Shield.Value;
                                } else {
-                                       shieldimage.Pixbuf = Gdk.Pixbuf.LoadFromResource ("logo.svg");
+                                       shieldimage.Pixbuf = IconTheme.Default.LoadIcon (Constants.LOGO_ICON,
+                                                                                        
Constants.MAX_SHIELD_ICON_SIZE,
+                                                                                        
IconLookupFlags.ForceSvg);
                                }
                                teamnameentry.Text = template.TeamName;
                                FillFormation ();
@@ -103,8 +104,6 @@ namespace LongoMatch.Gui.Component
                        
                        datebutton.Clicked += HandleCalendarbuttonClicked; 
                        
-                       subsbutton.Clicked += HandleSubsClicked;
-                       
                        Edited = false;
                }
 
@@ -203,12 +202,6 @@ namespace LongoMatch.Gui.Component
                        Team = template;
                }
                
-               void HandleSubsClicked (object sender, EventArgs e)
-               {
-                       teamtagger.SubstitutionsMode = subsbutton.Active;
-                       warninglabel.Visible = subsbutton.Active;
-               }
-
                void HandlePlayersSelectionChangedEvent (List<Player> players)
                {
                        PlayersSelected (players);
diff --git a/LongoMatch.GUI/Gui/MainWindow.cs b/LongoMatch.GUI/Gui/MainWindow.cs
index b8bdd29..08766dd 100644
--- a/LongoMatch.GUI/Gui/MainWindow.cs
+++ b/LongoMatch.GUI/Gui/MainWindow.cs
@@ -92,7 +92,7 @@ namespace LongoMatch.Gui
                                        (panel as IPanel).BackEvent += ResetGUI;
                                }
                                centralbox.PackStart (panel, true, true, 0);
-                               welcomepanel1.Hide ();
+                               welcomepanel.Hide ();
                        }
                }
                
@@ -140,6 +140,7 @@ namespace LongoMatch.Gui
                
                public void CreateNewProject (Project project) {
                        NewProjectPanel panel = new NewProjectPanel (project);
+                       panel.Name = "newprojectpanel";
                        SetPanel (panel);
                }
 
@@ -209,7 +210,7 @@ namespace LongoMatch.Gui
                        Title = Constants.SOFTWARE_NAME;
                        MakeActionsSensitive(false, projectType);
                        RemovePanel ();
-                       welcomepanel1.Show ();
+                       welcomepanel.Show ();
                }
 
                private void MakeActionsSensitive(bool sensitive, ProjectType projectType) {
diff --git a/LongoMatch.GUI/Gui/Panel/NewProjectPanel.cs b/LongoMatch.GUI/Gui/Panel/NewProjectPanel.cs
index d5c9eff..416e5f8 100644
--- a/LongoMatch.GUI/Gui/Panel/NewProjectPanel.cs
+++ b/LongoMatch.GUI/Gui/Panel/NewProjectPanel.cs
@@ -20,18 +20,13 @@ using System.Collections.Generic;
 using Gtk;
 using Gdk;
 using LongoMatch.Handlers;
-using LongoMatch.Interfaces;
 using LongoMatch.Interfaces.Multimedia;
 using LongoMatch.Store;
 using LongoMatch.Common;
 using LongoMatch.Store.Templates;
-using LongoMatch.Multimedia.Utils;
 using Misc = LongoMatch.Gui.Helpers.Misc;
 using Mono.Unix;
-using LongoMatch.Gui.Popup;
-using LongoMatch.Gui.Dialog;
 using LongoMatch.Gui.Helpers;
-using LongoMatch.Video.Utils;
 using LongoMatch.Interfaces.GUI;
 
 using Device = LongoMatch.Common.Device;
@@ -69,32 +64,34 @@ namespace LongoMatch.Gui.Panel
                        this.Build ();
                        this.mtoolkit = Config.MultimediaToolkit;
                        this.gtoolkit = Config.GUIToolkit;
+                       logoimage.Pixbuf = IconTheme.Default.LoadIcon ("longomatch", 
StyleConf.NewHeaderHeight - 10,
+                                                                      IconLookupFlags.ForceSvg);
                        notebook1.ShowTabs = false;
                        notebook1.ShowBorder = false;
-                       backgroundwidget.Background = Gdk.Pixbuf.LoadFromResource 
(Constants.BACKGROUND).RotateSimple (Gdk.PixbufRotation.Counterclockwise);
-                       backgroundwidget.WidthRequest = 200;
-                       nextbutton.Clicked += HandleNextClicked;
-                       backbutton.Clicked += HandleBackClicked;
+                       nextroundedbutton.Clicked += HandleNextClicked;
+                       backrectbutton.Clicked += HandleBackClicked;
                        ConnectSignals ();
                        FillCategories ();
                        FillFormats ();
                        FillDevices (mtoolkit.VideoDevices);
                        LoadTeams ();
+                       titlelabel.ModifyBg (StateType.Normal, Misc.ToGdkColor 
(Config.Style.PaletteBackgroundLight));
                        if (project == null) {
                                notebook1.Page = 0;
-                               datelabel.Text = DateTime.Now.ToShortDateString();
+                               datepicker1.Date = DateTime.Now;
                        } else {
                                notebook1.Page = 1;
                                this.project = project;
                                projectType = ProjectType.EditProject;
                                FillProjectDetails ();
                        }
+                       UpdateTitle();
                        Color.Parse ("red", ref red);
                        outputfilelabel.ModifyFg (StateType.Normal, red);
                        Color.Parse ("red", ref red);
                        urilabel.ModifyFg (StateType.Normal, red);
                        Color.Parse ("red", ref red);
-                       filelabel.ModifyFg (StateType.Normal, red);
+                       ApplyStyle ();
                }
                
                protected override void OnDestroyed ()
@@ -103,34 +100,39 @@ namespace LongoMatch.Gui.Panel
                        base.OnDestroyed ();
                }
                
+               void ApplyStyle () {
+                       centerbox.WidthRequest = StyleConf.NewTeamsComboWidth * 2 + StyleConf.NewTeamsSpacing;
+                       newheaderbox.HeightRequest = StyleConf.NewHeaderHeight;
+                       notebook1.BorderWidth = StyleConf.NewHeaderSpacing;
+                       lefttable.RowSpacing = filetable.RowSpacing =
+                               outputfiletable.RowSpacing = righttable.RowSpacing = 
StyleConf.NewTableHSpacing;
+                       lefttable.ColumnSpacing = righttable.ColumnSpacing = StyleConf.NewTableHSpacing;
+                       filetable.ColumnSpacing = outputfiletable.ColumnSpacing = StyleConf.NewTeamsSpacing; 
+                       vsimage.WidthRequest = StyleConf.NewTeamsSpacing;
+                       hometeamscombobox.WidthRequest = awayteamscombobox.WidthRequest = 
StyleConf.NewTeamsComboWidth;
+                       hometeamscombobox.HeightRequest = awayteamscombobox.HeightRequest = 
StyleConf.NewTeamsComboHeight;
+                       titlelabel.ModifyBg (StateType.Normal, Misc.ToGdkColor 
(Config.Style.PaletteBackgroundLight));
+               }
+               
                void LoadTeams () {
-                       drawingarea1.HeightRequest = 200;
-                       teamtagger = new TeamTagger (new WidgetWrapper (drawingarea1));
-                       teams = new ListStore (typeof(string));
-
-                       teamtagger.HomeColor = Constants.HOME_COLOR;
-                       teamtagger.AwayColor = Constants.AWAY_COLOR;
-
-                       foreach (string name in Config.TeamTemplatesProvider.TemplatesNames) {
-                               teams.AppendValues (name);
-                       }
-                       hometeamscombobox.Model = teams;
+                       List<TeamTemplate> teams;
+                       
+                       drawingarea.HeightRequest = 200;
+                       teamtagger = new TeamTagger (new WidgetWrapper (drawingarea));
+                       teams = Config.TeamTemplatesProvider.Templates;
+                       hometeamscombobox.Load (teams, false);
                        hometeamscombobox.Changed += (sender, e) => {
-                               LoadTemplate (hometeamscombobox.ActiveText, Team.LOCAL);};
-                       awayteamscombobox.Model = teams;
+                               LoadTemplate (hometeamscombobox.ActiveTeam, Team.LOCAL);};
+                       awayteamscombobox.Load (teams, true);
                        awayteamscombobox.Changed += (sender, e) => {
-                               LoadTemplate (awayteamscombobox.ActiveText, Team.VISITOR);};
+                               LoadTemplate (awayteamscombobox.ActiveTeam, Team.VISITOR);};
                        hometeamscombobox.Active = 0;
                        awayteamscombobox.Active = 0;
-                       teamtagger.SubstitutionsMode = true;
                }
                
                void ConnectSignals () {
-                       calendarbutton.Clicked += HandleCalendarbuttonClicked; 
-                       openbutton.Clicked += HandleOpenbuttonClicked;
                        savebutton.Clicked += HandleSavebuttonClicked;
                        urientry.Changed += HandleEntryChanged;
-                       fileEntry.Changed += HandleEntryChanged;
                        outfileEntry.Changed += HandleEntryChanged;
                        createbutton.Clicked += HandleCreateProject;
                        tagscombobox.Changed += HandleSportsTemplateChanged;
@@ -139,13 +141,12 @@ namespace LongoMatch.Gui.Panel
                void FillProjectDetails () {
                        seasonentry.Text = project.Description.Season;
                        competitionentry.Text = project.Description.Competition;
-                       datelabel.Text = project.Description.MatchDate.ToShortDateString();
-                       localSpinButton.Value = project.Description.LocalGoals;
-                       visitorSpinButton.Value = project.Description.VisitorGoals;
+                       datelabel2.Text = project.Description.MatchDate.ToShortDateString();
+                       datepicker1.Date = project.Description.MatchDate;
                        hometeamscombobox.Sensitive = false;
                        awayteamscombobox.Sensitive = false;
                        tagscombobox.Visible = false;
-                       label9.Visible = false;
+                       analysislabel.Visible = false;
                        filetable.Visible = true;
                        analysisTemplate = project.Categories;
                        LoadTemplate (project.LocalTeamTemplate, Team.LOCAL);
@@ -230,32 +231,32 @@ namespace LongoMatch.Gui.Panel
                
                void LoadTemplate (TeamTemplate template, Team team) {
                        if (team == Team.LOCAL) {
-                               if (template.Shield != null) {
-                                       homeshieldimage.Pixbuf = template.Shield.Value;
-                               } else {
-                                       homeshieldimage.Pixbuf = Gdk.Pixbuf.LoadFromResource ("logo.svg");    
                                          
-                               }
-                               homelabel.Text = template.TeamName;
                                hometemplate = template;
                        } else {
-                               if (template.Shield != null) {
-                                       awayshieldimage.Pixbuf = template.Shield.Value;
-                               } else {
-                                       awayshieldimage.Pixbuf = Gdk.Pixbuf.LoadFromResource ("logo.svg");    
                                          
-                               }
-                               awaylabel.Text = template.TeamName;
                                awaytemplate = template;
                        }
                        teamtagger.LoadTeams (hometemplate, awaytemplate,
                                              analysisTemplate.FieldBackground);
                }
                
-               bool CreateProject () {
+               void UpdateTitle ()
+               {
+                       if (notebook1.Page == 0) {
+                               titlelabel.Markup = Catalog.GetString ("<b>PROJECT TYPE</b>");
+                       } else if (notebook1.Page == 1) {
+                               titlelabel.Markup = Catalog.GetString ("<b>PROJECT PROPERTIES</b>");
+                       } else if (notebook1.Page == 2) {
+                               titlelabel.Markup = Catalog.GetString ("<b>PERIODS SYNCHRONIZATION</b>");
+                       }
+               }
+               
+               bool CreateProject ()
+               {
                        TreeIter iter;
                        
                        if (projectType == ProjectType.FileProject ||
-                           projectType == ProjectType.EditProject) {
-                               if (fileEntry.Text == "") {
+                               projectType == ProjectType.EditProject) {
+                               if (mediafilechooser1.File == null) {
                                        gtoolkit.WarningMessage (Catalog.GetString ("No input video file"));
                                        return false;
                                }
@@ -286,9 +287,7 @@ namespace LongoMatch.Gui.Panel
                        project.Description = new ProjectDescription ();
                        project.Description.Competition = competitionentry.Text;
                        project.Description.File = mediaFile;
-                       project.Description.LocalGoals = (int) localSpinButton.Value;
-                       project.Description.VisitorGoals = (int) visitorSpinButton.Value;
-                       project.Description.MatchDate = DateTime.Parse (datelabel.Text);
+                       project.Description.MatchDate = datepicker1.Date;
                        project.Description.Season = seasonentry.Text;
                        project.Description.LocalName = project.LocalTeamTemplate.TeamName;
                        project.Description.VisitorName = project.VisitorTeamTemplate.TeamName;
@@ -335,11 +334,6 @@ namespace LongoMatch.Gui.Panel
                        return true;
                }
                
-               void HandleCalendarbuttonClicked(object sender, System.EventArgs e)
-               {
-                       datelabel.Text = Config.GUIToolkit.SelectDate (project.Description.MatchDate, 
this).ToShortDateString ();
-               }
-
                void HandleSavebuttonClicked(object sender, System.EventArgs e)
                {
                        string filename;
@@ -352,21 +346,8 @@ namespace LongoMatch.Gui.Panel
                        }
                }
 
-               void HandleOpenbuttonClicked(object sender, System.EventArgs e)
-               {
-                       mediaFile = Misc.OpenFile (this);
-                       if (mediaFile != null) {
-                               fileEntry.Text = mediaFile.FilePath;
-                       }
-               }
-               
                void HandleEntryChanged (object sender, EventArgs e)
                {
-                       if (fileEntry.Text != "") {
-                               filelabel.ModifyFg (StateType.Normal);
-                       } else {
-                               filelabel.ModifyFg (StateType.Normal, red);
-                       }
                        if (urientry.Text != "") {
                                urilabel.ModifyFg (StateType.Normal);
                        } else {
@@ -407,9 +388,10 @@ namespace LongoMatch.Gui.Panel
                                }
                        } else {
                                notebook1.Page --;
-                               nextbutton.Visible = true;
+                               nextroundedbutton.Visible = true;
                                createbutton.Visible = false;
                        }
+                       UpdateTitle ();
                }
 
                void HandleNextClicked (object sender, EventArgs e)
@@ -430,15 +412,16 @@ namespace LongoMatch.Gui.Panel
                                case ProjectType.CaptureProject:
                                case ProjectType.FakeCaptureProject:
                                case ProjectType.URICaptureProject:
-                                       nextbutton.Visible = false;
+                                       nextroundedbutton.Visible = false;
                                        createbutton.Visible = true;
                                        break;
                                }
                        } else if (notebook1.Page == PROJECT_PERIODS) {
                                projectperiods1.Project = project;
-                               nextbutton.Visible = false;
+                               nextroundedbutton.Visible = false;
                                createbutton.Visible = true;
                        }
+                       UpdateTitle ();
                }
        }
 }
diff --git a/LongoMatch.GUI/Gui/Panel/SportsTemplatesPanel.cs 
b/LongoMatch.GUI/Gui/Panel/SportsTemplatesPanel.cs
index 1384334..3f6318c 100644
--- a/LongoMatch.GUI/Gui/Panel/SportsTemplatesPanel.cs
+++ b/LongoMatch.GUI/Gui/Panel/SportsTemplatesPanel.cs
@@ -88,7 +88,7 @@ namespace LongoMatch.Gui.Panel
                                if (template.Image != null)
                                        img = template.Image.Value;
                                else
-                                       img = Gdk.Pixbuf.LoadFromResource ("logo.svg");
+                                       img = IconTheme.Default.LoadIcon ("longomatch", 20, 
IconLookupFlags.ForceSvg);
                                        
                                iter = templates.AppendValues (img, template.Name);
                                if (first || template.Name == templateName) {
diff --git a/LongoMatch.GUI/Gui/Panel/TeamsTemplatesPanel.cs b/LongoMatch.GUI/Gui/Panel/TeamsTemplatesPanel.cs
index c1e07e3..bf353a6 100644
--- a/LongoMatch.GUI/Gui/Panel/TeamsTemplatesPanel.cs
+++ b/LongoMatch.GUI/Gui/Panel/TeamsTemplatesPanel.cs
@@ -84,7 +84,8 @@ namespace LongoMatch.Gui.Panel
                        
                }
 
-               void Load (string templateName) {
+               void Load (string templateName)
+               {
                        TreeIter templateIter = TreeIter.Zero;
                        bool first = true;
                        
@@ -94,11 +95,13 @@ namespace LongoMatch.Gui.Panel
                                Pixbuf img;
                                TreeIter iter;
                                
-                               if (template.Shield != null)
+                               if (template.Shield != null) {
                                        img = template.Shield.Value;
-                               else
-                                       img = Gdk.Pixbuf.LoadFromResource ("logo.svg");
-                                       
+                               } else {
+                                       img = IconTheme.Default.LoadIcon (Constants.LOGO_ICON,
+                                                                         Constants.MAX_SHIELD_ICON_SIZE,
+                                                                         IconLookupFlags.ForceSvg);
+                               }
                                iter = teams.AppendValues (img, template.Name, template.TeamName);
                                itersDict.Add (template.Name, iter);
                                if (first || template.Name == templateName) {
diff --git a/LongoMatch.GUI/Gui/Panel/WelcomePanel.cs b/LongoMatch.GUI/Gui/Panel/WelcomePanel.cs
index a8df929..4006392 100644
--- a/LongoMatch.GUI/Gui/Panel/WelcomePanel.cs
+++ b/LongoMatch.GUI/Gui/Panel/WelcomePanel.cs
@@ -54,42 +54,42 @@ namespace LongoMatch.Gui.Panel
                        HeightRequest = MinHeight;
                        WidthRequest = MinWidth;
                        buttonWidgets = new List<Widget>();
-                       hbox1.BorderWidth = (uint) Config.Style.WelcomeBorder;
+                       hbox1.BorderWidth = StyleConf.WelcomeBorder;
                        Create ();
                        Name = "WelcomePanel";
                }
 
                int MinWidth {
                        get {
-                               return Math.Max (Config.Style.WelcomeLogoWidth,
-                                                Config.Style.WelcomeIconSize * 3 +
-                                                Config.Style.WelcomeIconsHSpacing * 2) +
-                                       Config.Style.WelcomeMinWidthBorder;
+                               return Math.Max (StyleConf.WelcomeLogoWidth,
+                                                StyleConf.WelcomeIconSize * 3 +
+                                                StyleConf.WelcomeIconsHSpacing * 2) +
+                                       StyleConf.WelcomeMinWidthBorder;
                        }
                }
                
                int MinHeight {
                        get {
-                               return  HeaderHeight + Config.Style.WelcomeLogoHeight +
-                                       (IconHeight + Config.Style.WelcomeIconsVSpacing) * NRows + 20;
+                               return  HeaderHeight + StyleConf.WelcomeLogoHeight +
+                                       (IconHeight + StyleConf.WelcomeIconsVSpacing) * NRows + 20;
                        }
                }
                
                int IconHeight {
                        get {
-                               return Config.Style.WelcomeLogoHeight + Config.Style.WelcomeIconsTextSpacing +
-                                       Config.Style.WelcomeTextHeight;
+                               return StyleConf.WelcomeLogoHeight + StyleConf.WelcomeIconsTextSpacing +
+                                       StyleConf.WelcomeTextHeight;
                        }
                }
                
                int HeaderHeight {
                        get {
-                               return Config.Style.WelcomeBorder * 2 + Config.Style.WelcomeIconSize;
+                               return StyleConf.WelcomeBorder * 2 + StyleConf.WelcomeIconSize;
                        }
                }
                int NRows {
                        get {
-                               return (int)Math.Ceiling ((float)buttons.Length / 
Config.Style.WelcomeIconsPerRow);
+                               return (int)Math.Ceiling ((float)buttons.Length / 
StyleConf.WelcomeIconsPerRow);
                        }
                }
                
@@ -99,33 +99,33 @@ namespace LongoMatch.Gui.Panel
 
                        Gtk.Image prefImage = new Gtk.Image (
                                IconTheme.Default.LoadIcon ("longomatch-preferences",
-                                                   Config.Style.WelcomeIconSize, 0));
+                                                   StyleConf.WelcomeIconSize, 0));
                        preferencesbutton.Add (prefImage);
-                       preferencesbutton.WidthRequest = Config.Style.WelcomeIconSize;
-                       preferencesbutton.HeightRequest = Config.Style.WelcomeIconSize;
+                       preferencesbutton.WidthRequest = StyleConf.WelcomeIconSize;
+                       preferencesbutton.HeightRequest = StyleConf.WelcomeIconSize;
 
                        logoImage = new Gtk.Image ();
                        logoImage.Pixbuf = Gdk.Pixbuf.LoadFromResource ("longomatch-dark-bg.svg");
-                       logoImage.WidthRequest = Config.Style.WelcomeLogoWidth;
-                       logoImage.HeightRequest = Config.Style.WelcomeLogoHeight;
+                       logoImage.WidthRequest = StyleConf.WelcomeLogoWidth;
+                       logoImage.HeightRequest = StyleConf.WelcomeLogoHeight;
                        fixedwidget.Put (logoImage, 0, 0);
 
-                       padding = Config.Style.WelcomeLogoHeight + Config.Style.WelcomeIconsVSpacing;
+                       padding = StyleConf.WelcomeLogoHeight + StyleConf.WelcomeIconsVSpacing;
                        for (int i=0; i < buttons.Length; i++) {
                                Widget b;
                                int x, y;
                                
-                               x = (Config.Style.WelcomeIconsHSpacing + Config.Style.WelcomeIconSize) *
-                                       (i % Config.Style.WelcomeIconsPerRow);
-                               y = (Config.Style.WelcomeIconsVSpacing + Config.Style.WelcomeIconSize) *
-                                       (i / Config.Style.WelcomeIconsPerRow);
+                               x = (StyleConf.WelcomeIconsHSpacing + StyleConf.WelcomeIconSize) *
+                                       (i % StyleConf.WelcomeIconsPerRow);
+                               y = (StyleConf.WelcomeIconsVSpacing + StyleConf.WelcomeIconSize) *
+                                       (i / StyleConf.WelcomeIconsPerRow);
 
                                b = CreateButton (buttons[i]);
                                fixedwidget.Put (b, x, y + padding);
                                buttonWidgets.Add (b);
                        }
-                       fixedwidget.HeightRequest = Config.Style.WelcomeLogoHeight +
-                                       (IconHeight + Config.Style.WelcomeIconsVSpacing) * NRows; 
+                       fixedwidget.HeightRequest = StyleConf.WelcomeLogoHeight +
+                                       (IconHeight + StyleConf.WelcomeIconsVSpacing) * NRows; 
                }
                
                Widget CreateButton (WelcomeButton b) {
@@ -135,12 +135,12 @@ namespace LongoMatch.Gui.Panel
                        Label label;
                        
                        image = new Gtk.Image (
-                               IconTheme.Default.LoadIcon (b.name, Config.Style.WelcomeIconSize, 0));
+                               IconTheme.Default.LoadIcon (b.name, StyleConf.WelcomeIconSize, 0));
 
                        button = new Button ();
                        button.Clicked += (sender, e) => (b.func());
-                       button.HeightRequest = Config.Style.WelcomeIconSize;
-                       button.WidthRequest = Config.Style.WelcomeIconSize;
+                       button.HeightRequest = StyleConf.WelcomeIconSize;
+                       button.WidthRequest = StyleConf.WelcomeIconSize;
                        button.Add (image);
 
                        label = new Label (b.text);
@@ -148,11 +148,12 @@ namespace LongoMatch.Gui.Panel
                        label.LineWrapMode = Pango.WrapMode.Word;
                        label.Justify = Justification.Center;
 
-                       box = new VBox (false, Config.Style.WelcomeIconsTextSpacing);
+                       box = new VBox (false, StyleConf.WelcomeIconsTextSpacing);
                        box.PackStart (button, false, false, 0);
                        box.PackStart (label, false, false, 0);
                        box.HeightRequest = IconHeight;
                        box.ShowAll ();
+                       box.Name = b.name + "roundedbutton";
                        return box;
                }
        }
diff --git a/LongoMatch.GUI/LongoMatch.GUI.mdp b/LongoMatch.GUI/LongoMatch.GUI.mdp
index 8f08f86..5161764 100644
--- a/LongoMatch.GUI/LongoMatch.GUI.mdp
+++ b/LongoMatch.GUI/LongoMatch.GUI.mdp
@@ -73,7 +73,6 @@
     <File subtype="Directory" buildaction="Compile" name="." />
     <File subtype="Directory" buildaction="Compile" name="." />
     <File subtype="Code" buildaction="Compile" name="Gui/Dialog/About.cs" />
-    <File subtype="Code" buildaction="EmbedAsResource" name="../images/logo.svg" />
     <File subtype="Code" buildaction="EmbedAsResource" name="../images/video.png" />
     <File subtype="Code" buildaction="EmbedAsResource" name="../images/camera-video.png" />
     <File subtype="Directory" buildaction="Compile" name="Gui/Component" />
@@ -182,6 +181,12 @@
     <File subtype="Code" buildaction="Nothing" name="LongoMatch.GUI.dll.config" 
copyToOutputDirectory="PreserveNewest" />
     <File subtype="Code" buildaction="EmbedAsResource" name="../data/images/longomatch-light-bg.svg" />
     <File subtype="Code" buildaction="EmbedAsResource" name="../data/images/longomatch-dark-bg.svg" />
+    <File subtype="Code" buildaction="Compile" name="Gui/Component/TeamsComboBox.cs" />
+    <File subtype="Directory" buildaction="Compile" name="Gui/Component" />
+    <File subtype="Code" buildaction="Compile" name="Gui/Component/MediaFileChooser.cs" />
+    <File subtype="Code" buildaction="Compile" name="gtk-gui/LongoMatch.Gui.Component.MediaFileChooser.cs" />
+    <File subtype="Code" buildaction="Compile" name="Gui/Component/DatePicker.cs" />
+    <File subtype="Code" buildaction="Compile" name="gtk-gui/LongoMatch.Gui.Component.DatePicker.cs" />
   </Contents>
   <References>
     <ProjectReference type="Package" localcopy="True" refto="atk-sharp, Version=2.12.0.0, Culture=neutral, 
PublicKeyToken=35e10195dab3c99f" />
diff --git a/LongoMatch.GUI/Makefile.am b/LongoMatch.GUI/Makefile.am
index 527a24f..ea2ef64 100644
--- a/LongoMatch.GUI/Makefile.am
+++ b/LongoMatch.GUI/Makefile.am
@@ -12,6 +12,7 @@ SOURCES = Gui/Cairo.cs \
        Gui/Component/CoordinatesTagger.cs \
        Gui/Component/GeneralPreferencesPanel.cs \
        Gui/Component/LiveAnalysisPreferences.cs \
+       Gui/Component/MediaFileChooser.cs \
        Gui/Component/NotesWidget.cs \
        Gui/Component/PeriodsRecoder.cs \
        Gui/Component/PlayListWidget.cs \
@@ -34,6 +35,7 @@ SOURCES = Gui/Cairo.cs \
        Gui/Component/Stats/Plotter.cs \
        Gui/Component/Stats/SubcategoryViewer.cs \
        Gui/Component/TeamTemplateEditor.cs \
+       Gui/Component/TeamsComboBox.cs \
        Gui/Component/Timeline.cs \
        Gui/Component/VideoPreferencesPanel.cs \
        Gui/Dialog/About.cs \
@@ -84,6 +86,7 @@ SOURCES = Gui/Cairo.cs \
        gtk-gui/LongoMatch.Gui.Component.GameViewer.cs \
        gtk-gui/LongoMatch.Gui.Component.GeneralPreferencesPanel.cs \
        gtk-gui/LongoMatch.Gui.Component.LiveAnalysisPreferences.cs \
+       gtk-gui/LongoMatch.Gui.Component.MediaFileChooser.cs \
        gtk-gui/LongoMatch.Gui.Component.NotesWidget.cs \
        gtk-gui/LongoMatch.Gui.Component.PeriodsRecoder.cs \
        gtk-gui/LongoMatch.Gui.Component.PlayListWidget.cs \
@@ -134,7 +137,6 @@ SOURCES = Gui/Cairo.cs \
        gtk-gui/generated.cs
 
 RESOURCES = gtk-gui/gui.stetic \
-       $(top_srcdir)/images/logo.svg \
        $(top_srcdir)/images/video.png \
        $(top_srcdir)/images/camera-video.png \
        $(top_srcdir)/images/background.png \
diff --git a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.CodingWidget.cs 
b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.CodingWidget.cs
index e4d9cdd..f5e0fbe 100644
--- a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.CodingWidget.cs
+++ b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.CodingWidget.cs
@@ -40,12 +40,12 @@ namespace LongoMatch.Gui.Component
                        this.timelineMode.Group = this.positionMode.Group;
                        w3.Add (this.timelineMode, null);
                        this.autoTaggingMode = new global::Gtk.RadioAction ("autoTaggingMode", null, 
global::Mono.Unix.Catalog.GetString ("Automatic tagging view"), "gtk-select-color", 0);
-                       this.autoTaggingMode.Group = this.positionMode.Group;
+                       this.autoTaggingMode.Group = this.timelineMode.Group;
                        w3.Add (this.autoTaggingMode, null);
                        this.zoomFitAction = new global::Gtk.Action ("zoomFitAction", null, null, 
"gtk-zoom-fit");
                        w3.Add (this.zoomFitAction, null);
                        this.convertAction = new global::Gtk.RadioAction ("convertAction", null, null, 
"gtk-convert", 0);
-                       this.convertAction.Group = this.positionMode.Group;
+                       this.convertAction.Group = this.autoTaggingMode.Group;
                        w3.Add (this.convertAction, null);
                        this.UIManager.InsertActionGroup (w3, 1);
                        this.Name = "LongoMatch.Gui.Component.CodingWidget";
diff --git a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.Stats.Plotter.cs 
b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.Stats.Plotter.cs
index ab07947..d9515ac 100644
--- a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.Stats.Plotter.cs
+++ b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.Stats.Plotter.cs
@@ -31,6 +31,7 @@ namespace LongoMatch.Gui.Component.Stats
                        this.historadiobutton = new global::Gtk.RadioButton 
(global::Mono.Unix.Catalog.GetString ("Histogram"));
                        this.historadiobutton.CanFocus = true;
                        this.historadiobutton.Name = "historadiobutton";
+                       this.historadiobutton.Active = true;
                        this.historadiobutton.DrawIndicator = true;
                        this.historadiobutton.UseUnderline = true;
                        this.historadiobutton.Group = new global::GLib.SList (global::System.IntPtr.Zero);
diff --git a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.TeamTemplateEditor.cs 
b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.TeamTemplateEditor.cs
index 004cd02..1febb03 100644
--- a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.TeamTemplateEditor.cs
+++ b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.TeamTemplateEditor.cs
@@ -29,9 +29,6 @@ namespace LongoMatch.Gui.Component
                private global::Gtk.Button applybutton;
                private global::Gtk.Label GtkLabel6;
                private global::Gtk.DrawingArea drawingarea;
-               private global::Gtk.HBox hbox7;
-               private global::Gtk.ToggleButton subsbutton;
-               private global::Gtk.Label warninglabel;
                private global::Gtk.VSeparator vseparator1;
                private global::Gtk.Frame playerframe;
                private global::Gtk.Alignment GtkAlignment5;
@@ -251,56 +248,17 @@ namespace LongoMatch.Gui.Component
                        this.vbox5.Add (this.drawingarea);
                        global::Gtk.Box.BoxChild w27 = ((global::Gtk.Box.BoxChild)(this.vbox5 
[this.drawingarea]));
                        w27.Position = 1;
-                       // Container child vbox5.Gtk.Box+BoxChild
-                       this.hbox7 = new global::Gtk.HBox ();
-                       this.hbox7.Name = "hbox7";
-                       this.hbox7.Spacing = 6;
-                       // Container child hbox7.Gtk.Box+BoxChild
-                       this.subsbutton = new global::Gtk.ToggleButton ();
-                       this.subsbutton.Name = "subsbutton";
-                       this.subsbutton.UseUnderline = true;
-                       this.subsbutton.FocusOnClick = false;
-                       this.subsbutton.Active = true;
-                       // Container child subsbutton.Gtk.Container+ContainerChild
-                       global::Gtk.Alignment w28 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
-                       // Container child GtkAlignment.Gtk.Container+ContainerChild
-                       global::Gtk.HBox w29 = new global::Gtk.HBox ();
-                       w29.Spacing = 2;
-                       // Container child GtkHBox.Gtk.Container+ContainerChild
-                       global::Gtk.Image w30 = new global::Gtk.Image ();
-                       w30.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-refresh", 
global::Gtk.IconSize.Dialog);
-                       w29.Add (w30);
-                       // Container child GtkHBox.Gtk.Container+ContainerChild
-                       global::Gtk.Label w32 = new global::Gtk.Label ();
-                       w29.Add (w32);
-                       w28.Add (w29);
-                       this.subsbutton.Add (w28);
-                       this.hbox7.Add (this.subsbutton);
-                       global::Gtk.Box.BoxChild w36 = ((global::Gtk.Box.BoxChild)(this.hbox7 
[this.subsbutton]));
-                       w36.Position = 0;
-                       // Container child hbox7.Gtk.Box+BoxChild
-                       this.warninglabel = new global::Gtk.Label ();
-                       this.warninglabel.Name = "warninglabel";
-                       this.warninglabel.LabelProp = global::Mono.Unix.Catalog.GetString ("Substitutions 
activated.\nClick 2 players to swap them");
-                       this.hbox7.Add (this.warninglabel);
-                       global::Gtk.Box.BoxChild w37 = ((global::Gtk.Box.BoxChild)(this.hbox7 
[this.warninglabel]));
-                       w37.Position = 1;
-                       this.vbox5.Add (this.hbox7);
-                       global::Gtk.Box.BoxChild w38 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox7]));
-                       w38.Position = 2;
-                       w38.Expand = false;
-                       w38.Fill = false;
                        this.hbox4.Add (this.vbox5);
-                       global::Gtk.Box.BoxChild w39 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.vbox5]));
-                       w39.Position = 0;
+                       global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.vbox5]));
+                       w28.Position = 0;
                        // Container child hbox4.Gtk.Box+BoxChild
                        this.vseparator1 = new global::Gtk.VSeparator ();
                        this.vseparator1.Name = "vseparator1";
                        this.hbox4.Add (this.vseparator1);
-                       global::Gtk.Box.BoxChild w40 = ((global::Gtk.Box.BoxChild)(this.hbox4 
[this.vseparator1]));
-                       w40.Position = 1;
-                       w40.Expand = false;
-                       w40.Fill = false;
+                       global::Gtk.Box.BoxChild w29 = ((global::Gtk.Box.BoxChild)(this.hbox4 
[this.vseparator1]));
+                       w29.Position = 1;
+                       w29.Expand = false;
+                       w29.Fill = false;
                        // Container child hbox4.Gtk.Box+BoxChild
                        this.playerframe = new global::Gtk.Frame ();
                        this.playerframe.Name = "playerframe";
@@ -321,10 +279,10 @@ namespace LongoMatch.Gui.Component
                        this.playerimage.Name = "playerimage";
                        this.playereventbox.Add (this.playerimage);
                        this.vbox6.Add (this.playereventbox);
-                       global::Gtk.Box.BoxChild w42 = ((global::Gtk.Box.BoxChild)(this.vbox6 
[this.playereventbox]));
-                       w42.Position = 0;
-                       w42.Expand = false;
-                       w42.Fill = false;
+                       global::Gtk.Box.BoxChild w31 = ((global::Gtk.Box.BoxChild)(this.vbox6 
[this.playereventbox]));
+                       w31.Position = 0;
+                       w31.Expand = false;
+                       w31.Fill = false;
                        // Container child vbox6.Gtk.Box+BoxChild
                        this.table1 = new global::Gtk.Table (((uint)(4)), ((uint)(4)), false);
                        this.table1.Name = "table1";
@@ -338,8 +296,8 @@ namespace LongoMatch.Gui.Component
                        this.bdaylabel = new global::Gtk.Label ();
                        this.bdaylabel.Name = "bdaylabel";
                        this.hbox3.Add (this.bdaylabel);
-                       global::Gtk.Box.BoxChild w43 = ((global::Gtk.Box.BoxChild)(this.hbox3 
[this.bdaylabel]));
-                       w43.Position = 0;
+                       global::Gtk.Box.BoxChild w32 = ((global::Gtk.Box.BoxChild)(this.hbox3 
[this.bdaylabel]));
+                       w32.Position = 0;
                        // Container child hbox3.Gtk.Box+BoxChild
                        this.datebutton = new global::Gtk.Button ();
                        this.datebutton.CanFocus = true;
@@ -347,18 +305,18 @@ namespace LongoMatch.Gui.Component
                        this.datebutton.UseUnderline = true;
                        this.datebutton.Label = global::Mono.Unix.Catalog.GetString ("_Calendar");
                        this.hbox3.Add (this.datebutton);
-                       global::Gtk.Box.BoxChild w44 = ((global::Gtk.Box.BoxChild)(this.hbox3 
[this.datebutton]));
-                       w44.Position = 1;
-                       w44.Expand = false;
-                       w44.Fill = false;
+                       global::Gtk.Box.BoxChild w33 = ((global::Gtk.Box.BoxChild)(this.hbox3 
[this.datebutton]));
+                       w33.Position = 1;
+                       w33.Expand = false;
+                       w33.Fill = false;
                        this.table1.Add (this.hbox3);
-                       global::Gtk.Table.TableChild w45 = ((global::Gtk.Table.TableChild)(this.table1 
[this.hbox3]));
-                       w45.TopAttach = ((uint)(3));
-                       w45.BottomAttach = ((uint)(4));
-                       w45.LeftAttach = ((uint)(1));
-                       w45.RightAttach = ((uint)(2));
-                       w45.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w45.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w34 = ((global::Gtk.Table.TableChild)(this.table1 
[this.hbox3]));
+                       w34.TopAttach = ((uint)(3));
+                       w34.BottomAttach = ((uint)(4));
+                       w34.LeftAttach = ((uint)(1));
+                       w34.RightAttach = ((uint)(2));
+                       w34.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w34.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child table1.Gtk.Table+TableChild
                        this.heightspinbutton = new global::Gtk.SpinButton (0, 100, 1);
                        this.heightspinbutton.CanFocus = true;
@@ -369,84 +327,84 @@ namespace LongoMatch.Gui.Component
                        this.heightspinbutton.Numeric = true;
                        this.heightspinbutton.Value = 18;
                        this.table1.Add (this.heightspinbutton);
-                       global::Gtk.Table.TableChild w46 = ((global::Gtk.Table.TableChild)(this.table1 
[this.heightspinbutton]));
-                       w46.TopAttach = ((uint)(1));
-                       w46.BottomAttach = ((uint)(2));
-                       w46.LeftAttach = ((uint)(3));
-                       w46.RightAttach = ((uint)(4));
-                       w46.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w46.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w35 = ((global::Gtk.Table.TableChild)(this.table1 
[this.heightspinbutton]));
+                       w35.TopAttach = ((uint)(1));
+                       w35.BottomAttach = ((uint)(2));
+                       w35.LeftAttach = ((uint)(3));
+                       w35.RightAttach = ((uint)(4));
+                       w35.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w35.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child table1.Gtk.Table+TableChild
                        this.label11 = new global::Gtk.Label ();
                        this.label11.Name = "label11";
                        this.label11.LabelProp = global::Mono.Unix.Catalog.GetString ("Position:");
                        this.table1.Add (this.label11);
-                       global::Gtk.Table.TableChild w47 = ((global::Gtk.Table.TableChild)(this.table1 
[this.label11]));
-                       w47.LeftAttach = ((uint)(2));
-                       w47.RightAttach = ((uint)(3));
-                       w47.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w47.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w36 = ((global::Gtk.Table.TableChild)(this.table1 
[this.label11]));
+                       w36.LeftAttach = ((uint)(2));
+                       w36.RightAttach = ((uint)(3));
+                       w36.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w36.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child table1.Gtk.Table+TableChild
                        this.label12 = new global::Gtk.Label ();
                        this.label12.Name = "label12";
                        this.label12.LabelProp = global::Mono.Unix.Catalog.GetString ("Name:");
                        this.table1.Add (this.label12);
-                       global::Gtk.Table.TableChild w48 = ((global::Gtk.Table.TableChild)(this.table1 
[this.label12]));
-                       w48.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w37 = ((global::Gtk.Table.TableChild)(this.table1 
[this.label12]));
+                       w37.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child table1.Gtk.Table+TableChild
                        this.label3 = new global::Gtk.Label ();
                        this.label3.Name = "label3";
                        this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("Number:");
                        this.table1.Add (this.label3);
-                       global::Gtk.Table.TableChild w49 = ((global::Gtk.Table.TableChild)(this.table1 
[this.label3]));
-                       w49.TopAttach = ((uint)(1));
-                       w49.BottomAttach = ((uint)(2));
-                       w49.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w49.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w38 = ((global::Gtk.Table.TableChild)(this.table1 
[this.label3]));
+                       w38.TopAttach = ((uint)(1));
+                       w38.BottomAttach = ((uint)(2));
+                       w38.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w38.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child table1.Gtk.Table+TableChild
                        this.label5 = new global::Gtk.Label ();
                        this.label5.Name = "label5";
                        this.label5.LabelProp = global::Mono.Unix.Catalog.GetString ("Height");
                        this.table1.Add (this.label5);
-                       global::Gtk.Table.TableChild w50 = ((global::Gtk.Table.TableChild)(this.table1 
[this.label5]));
-                       w50.TopAttach = ((uint)(1));
-                       w50.BottomAttach = ((uint)(2));
-                       w50.LeftAttach = ((uint)(2));
-                       w50.RightAttach = ((uint)(3));
-                       w50.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w50.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w39 = ((global::Gtk.Table.TableChild)(this.table1 
[this.label5]));
+                       w39.TopAttach = ((uint)(1));
+                       w39.BottomAttach = ((uint)(2));
+                       w39.LeftAttach = ((uint)(2));
+                       w39.RightAttach = ((uint)(3));
+                       w39.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w39.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child table1.Gtk.Table+TableChild
                        this.label6 = new global::Gtk.Label ();
                        this.label6.Name = "label6";
                        this.label6.LabelProp = global::Mono.Unix.Catalog.GetString ("Weight");
                        this.table1.Add (this.label6);
-                       global::Gtk.Table.TableChild w51 = ((global::Gtk.Table.TableChild)(this.table1 
[this.label6]));
-                       w51.TopAttach = ((uint)(2));
-                       w51.BottomAttach = ((uint)(3));
-                       w51.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w51.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w40 = ((global::Gtk.Table.TableChild)(this.table1 
[this.label6]));
+                       w40.TopAttach = ((uint)(2));
+                       w40.BottomAttach = ((uint)(3));
+                       w40.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w40.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child table1.Gtk.Table+TableChild
                        this.label7 = new global::Gtk.Label ();
                        this.label7.Name = "label7";
                        this.label7.LabelProp = global::Mono.Unix.Catalog.GetString ("Birth day");
                        this.table1.Add (this.label7);
-                       global::Gtk.Table.TableChild w52 = ((global::Gtk.Table.TableChild)(this.table1 
[this.label7]));
-                       w52.TopAttach = ((uint)(3));
-                       w52.BottomAttach = ((uint)(4));
-                       w52.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w52.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w41 = ((global::Gtk.Table.TableChild)(this.table1 
[this.label7]));
+                       w41.TopAttach = ((uint)(3));
+                       w41.BottomAttach = ((uint)(4));
+                       w41.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w41.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child table1.Gtk.Table+TableChild
                        this.label8 = new global::Gtk.Label ();
                        this.label8.Name = "label8";
                        this.label8.LabelProp = global::Mono.Unix.Catalog.GetString ("Nationality");
                        this.table1.Add (this.label8);
-                       global::Gtk.Table.TableChild w53 = ((global::Gtk.Table.TableChild)(this.table1 
[this.label8]));
-                       w53.TopAttach = ((uint)(2));
-                       w53.BottomAttach = ((uint)(3));
-                       w53.LeftAttach = ((uint)(2));
-                       w53.RightAttach = ((uint)(3));
-                       w53.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w53.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w42 = ((global::Gtk.Table.TableChild)(this.table1 
[this.label8]));
+                       w42.TopAttach = ((uint)(2));
+                       w42.BottomAttach = ((uint)(3));
+                       w42.LeftAttach = ((uint)(2));
+                       w42.RightAttach = ((uint)(3));
+                       w42.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w42.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child table1.Gtk.Table+TableChild
                        this.mailentry = new global::Gtk.Entry ();
                        this.mailentry.CanFocus = true;
@@ -454,25 +412,25 @@ namespace LongoMatch.Gui.Component
                        this.mailentry.IsEditable = true;
                        this.mailentry.InvisibleChar = '•';
                        this.table1.Add (this.mailentry);
-                       global::Gtk.Table.TableChild w54 = ((global::Gtk.Table.TableChild)(this.table1 
[this.mailentry]));
-                       w54.TopAttach = ((uint)(3));
-                       w54.BottomAttach = ((uint)(4));
-                       w54.LeftAttach = ((uint)(3));
-                       w54.RightAttach = ((uint)(4));
-                       w54.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w54.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w43 = ((global::Gtk.Table.TableChild)(this.table1 
[this.mailentry]));
+                       w43.TopAttach = ((uint)(3));
+                       w43.BottomAttach = ((uint)(4));
+                       w43.LeftAttach = ((uint)(3));
+                       w43.RightAttach = ((uint)(4));
+                       w43.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w43.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child table1.Gtk.Table+TableChild
                        this.maillabel = new global::Gtk.Label ();
                        this.maillabel.Name = "maillabel";
                        this.maillabel.LabelProp = global::Mono.Unix.Catalog.GetString ("E-mail:");
                        this.table1.Add (this.maillabel);
-                       global::Gtk.Table.TableChild w55 = ((global::Gtk.Table.TableChild)(this.table1 
[this.maillabel]));
-                       w55.TopAttach = ((uint)(3));
-                       w55.BottomAttach = ((uint)(4));
-                       w55.LeftAttach = ((uint)(2));
-                       w55.RightAttach = ((uint)(3));
-                       w55.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w55.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w44 = ((global::Gtk.Table.TableChild)(this.table1 
[this.maillabel]));
+                       w44.TopAttach = ((uint)(3));
+                       w44.BottomAttach = ((uint)(4));
+                       w44.LeftAttach = ((uint)(2));
+                       w44.RightAttach = ((uint)(3));
+                       w44.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w44.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child table1.Gtk.Table+TableChild
                        this.nameentry = new global::Gtk.Entry ();
                        this.nameentry.CanFocus = true;
@@ -480,11 +438,11 @@ namespace LongoMatch.Gui.Component
                        this.nameentry.IsEditable = true;
                        this.nameentry.InvisibleChar = '●';
                        this.table1.Add (this.nameentry);
-                       global::Gtk.Table.TableChild w56 = ((global::Gtk.Table.TableChild)(this.table1 
[this.nameentry]));
-                       w56.LeftAttach = ((uint)(1));
-                       w56.RightAttach = ((uint)(2));
-                       w56.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w56.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w45 = ((global::Gtk.Table.TableChild)(this.table1 
[this.nameentry]));
+                       w45.LeftAttach = ((uint)(1));
+                       w45.RightAttach = ((uint)(2));
+                       w45.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w45.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child table1.Gtk.Table+TableChild
                        this.nationalityentry = new global::Gtk.Entry ();
                        this.nationalityentry.CanFocus = true;
@@ -492,13 +450,13 @@ namespace LongoMatch.Gui.Component
                        this.nationalityentry.IsEditable = true;
                        this.nationalityentry.InvisibleChar = '●';
                        this.table1.Add (this.nationalityentry);
-                       global::Gtk.Table.TableChild w57 = ((global::Gtk.Table.TableChild)(this.table1 
[this.nationalityentry]));
-                       w57.TopAttach = ((uint)(2));
-                       w57.BottomAttach = ((uint)(3));
-                       w57.LeftAttach = ((uint)(3));
-                       w57.RightAttach = ((uint)(4));
-                       w57.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w57.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w46 = ((global::Gtk.Table.TableChild)(this.table1 
[this.nationalityentry]));
+                       w46.TopAttach = ((uint)(2));
+                       w46.BottomAttach = ((uint)(3));
+                       w46.LeftAttach = ((uint)(3));
+                       w46.RightAttach = ((uint)(4));
+                       w46.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w46.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child table1.Gtk.Table+TableChild
                        this.numberspinbutton = new global::Gtk.SpinButton (0, 100, 1);
                        this.numberspinbutton.CanFocus = true;
@@ -507,13 +465,13 @@ namespace LongoMatch.Gui.Component
                        this.numberspinbutton.ClimbRate = 1;
                        this.numberspinbutton.Numeric = true;
                        this.table1.Add (this.numberspinbutton);
-                       global::Gtk.Table.TableChild w58 = ((global::Gtk.Table.TableChild)(this.table1 
[this.numberspinbutton]));
-                       w58.TopAttach = ((uint)(1));
-                       w58.BottomAttach = ((uint)(2));
-                       w58.LeftAttach = ((uint)(1));
-                       w58.RightAttach = ((uint)(2));
-                       w58.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w58.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w47 = ((global::Gtk.Table.TableChild)(this.table1 
[this.numberspinbutton]));
+                       w47.TopAttach = ((uint)(1));
+                       w47.BottomAttach = ((uint)(2));
+                       w47.LeftAttach = ((uint)(1));
+                       w47.RightAttach = ((uint)(2));
+                       w47.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w47.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child table1.Gtk.Table+TableChild
                        this.positionentry = new global::Gtk.Entry ();
                        this.positionentry.CanFocus = true;
@@ -521,11 +479,11 @@ namespace LongoMatch.Gui.Component
                        this.positionentry.IsEditable = true;
                        this.positionentry.InvisibleChar = '●';
                        this.table1.Add (this.positionentry);
-                       global::Gtk.Table.TableChild w59 = ((global::Gtk.Table.TableChild)(this.table1 
[this.positionentry]));
-                       w59.LeftAttach = ((uint)(3));
-                       w59.RightAttach = ((uint)(4));
-                       w59.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w59.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w48 = ((global::Gtk.Table.TableChild)(this.table1 
[this.positionentry]));
+                       w48.LeftAttach = ((uint)(3));
+                       w48.RightAttach = ((uint)(4));
+                       w48.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w48.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child table1.Gtk.Table+TableChild
                        this.weightspinbutton = new global::Gtk.SpinButton (0, 1000, 1);
                        this.weightspinbutton.CanFocus = true;
@@ -535,18 +493,18 @@ namespace LongoMatch.Gui.Component
                        this.weightspinbutton.Numeric = true;
                        this.weightspinbutton.Value = 80;
                        this.table1.Add (this.weightspinbutton);
-                       global::Gtk.Table.TableChild w60 = ((global::Gtk.Table.TableChild)(this.table1 
[this.weightspinbutton]));
-                       w60.TopAttach = ((uint)(2));
-                       w60.BottomAttach = ((uint)(3));
-                       w60.LeftAttach = ((uint)(1));
-                       w60.RightAttach = ((uint)(2));
-                       w60.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w60.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w49 = ((global::Gtk.Table.TableChild)(this.table1 
[this.weightspinbutton]));
+                       w49.TopAttach = ((uint)(2));
+                       w49.BottomAttach = ((uint)(3));
+                       w49.LeftAttach = ((uint)(1));
+                       w49.RightAttach = ((uint)(2));
+                       w49.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w49.YOptions = ((global::Gtk.AttachOptions)(4));
                        this.vbox6.Add (this.table1);
-                       global::Gtk.Box.BoxChild w61 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.table1]));
-                       w61.Position = 1;
-                       w61.Expand = false;
-                       w61.Fill = false;
+                       global::Gtk.Box.BoxChild w50 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.table1]));
+                       w50.Position = 1;
+                       w50.Expand = false;
+                       w50.Fill = false;
                        this.GtkAlignment5.Add (this.vbox6);
                        this.playerframe.Add (this.GtkAlignment5);
                        this.GtkLabel3 = new global::Gtk.Label ();
@@ -555,13 +513,13 @@ namespace LongoMatch.Gui.Component
                        this.GtkLabel3.UseMarkup = true;
                        this.playerframe.LabelWidget = this.GtkLabel3;
                        this.hbox4.Add (this.playerframe);
-                       global::Gtk.Box.BoxChild w64 = ((global::Gtk.Box.BoxChild)(this.hbox4 
[this.playerframe]));
-                       w64.Position = 2;
-                       w64.Expand = false;
-                       w64.Fill = false;
+                       global::Gtk.Box.BoxChild w53 = ((global::Gtk.Box.BoxChild)(this.hbox4 
[this.playerframe]));
+                       w53.Position = 2;
+                       w53.Expand = false;
+                       w53.Fill = false;
                        this.vbox3.Add (this.hbox4);
-                       global::Gtk.Box.BoxChild w65 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.hbox4]));
-                       w65.Position = 0;
+                       global::Gtk.Box.BoxChild w54 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.hbox4]));
+                       w54.Position = 0;
                        // Container child vbox3.Gtk.Box+BoxChild
                        this.hbuttonbox2 = new global::Gtk.HButtonBox ();
                        this.hbuttonbox2.Name = "hbuttonbox2";
@@ -572,87 +530,86 @@ namespace LongoMatch.Gui.Component
                        this.savebutton.Name = "savebutton";
                        this.savebutton.UseUnderline = true;
                        // Container child savebutton.Gtk.Container+ContainerChild
-                       global::Gtk.Alignment w66 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
+                       global::Gtk.Alignment w55 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
                        // Container child GtkAlignment.Gtk.Container+ContainerChild
-                       global::Gtk.HBox w67 = new global::Gtk.HBox ();
-                       w67.Spacing = 2;
+                       global::Gtk.HBox w56 = new global::Gtk.HBox ();
+                       w56.Spacing = 2;
                        // Container child GtkHBox.Gtk.Container+ContainerChild
-                       global::Gtk.Image w68 = new global::Gtk.Image ();
-                       w68.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-save", 
global::Gtk.IconSize.Dialog);
-                       w67.Add (w68);
+                       global::Gtk.Image w57 = new global::Gtk.Image ();
+                       w57.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-save", 
global::Gtk.IconSize.Dialog);
+                       w56.Add (w57);
                        // Container child GtkHBox.Gtk.Container+ContainerChild
-                       global::Gtk.Label w70 = new global::Gtk.Label ();
-                       w70.LabelProp = global::Mono.Unix.Catalog.GetString ("Save template");
-                       w70.UseUnderline = true;
-                       w67.Add (w70);
-                       w66.Add (w67);
-                       this.savebutton.Add (w66);
+                       global::Gtk.Label w59 = new global::Gtk.Label ();
+                       w59.LabelProp = global::Mono.Unix.Catalog.GetString ("Save template");
+                       w59.UseUnderline = true;
+                       w56.Add (w59);
+                       w55.Add (w56);
+                       this.savebutton.Add (w55);
                        this.hbuttonbox2.Add (this.savebutton);
-                       global::Gtk.ButtonBox.ButtonBoxChild w74 = 
((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox2 [this.savebutton]));
-                       w74.Expand = false;
-                       w74.Fill = false;
+                       global::Gtk.ButtonBox.ButtonBoxChild w63 = 
((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox2 [this.savebutton]));
+                       w63.Expand = false;
+                       w63.Fill = false;
                        // Container child hbuttonbox2.Gtk.ButtonBox+ButtonBoxChild
                        this.newplayerbutton = new global::Gtk.Button ();
                        this.newplayerbutton.CanFocus = true;
                        this.newplayerbutton.Name = "newplayerbutton";
                        this.newplayerbutton.UseUnderline = true;
                        // Container child newplayerbutton.Gtk.Container+ContainerChild
-                       global::Gtk.Alignment w75 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
+                       global::Gtk.Alignment w64 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
                        // Container child GtkAlignment.Gtk.Container+ContainerChild
-                       global::Gtk.HBox w76 = new global::Gtk.HBox ();
-                       w76.Spacing = 2;
+                       global::Gtk.HBox w65 = new global::Gtk.HBox ();
+                       w65.Spacing = 2;
                        // Container child GtkHBox.Gtk.Container+ContainerChild
-                       global::Gtk.Image w77 = new global::Gtk.Image ();
-                       w77.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-new", 
global::Gtk.IconSize.Dialog);
-                       w76.Add (w77);
+                       global::Gtk.Image w66 = new global::Gtk.Image ();
+                       w66.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-new", 
global::Gtk.IconSize.Dialog);
+                       w65.Add (w66);
                        // Container child GtkHBox.Gtk.Container+ContainerChild
-                       global::Gtk.Label w79 = new global::Gtk.Label ();
-                       w79.LabelProp = global::Mono.Unix.Catalog.GetString ("New player");
-                       w79.UseUnderline = true;
-                       w76.Add (w79);
-                       w75.Add (w76);
-                       this.newplayerbutton.Add (w75);
+                       global::Gtk.Label w68 = new global::Gtk.Label ();
+                       w68.LabelProp = global::Mono.Unix.Catalog.GetString ("New player");
+                       w68.UseUnderline = true;
+                       w65.Add (w68);
+                       w64.Add (w65);
+                       this.newplayerbutton.Add (w64);
                        this.hbuttonbox2.Add (this.newplayerbutton);
-                       global::Gtk.ButtonBox.ButtonBoxChild w83 = 
((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox2 [this.newplayerbutton]));
-                       w83.Position = 1;
-                       w83.Expand = false;
-                       w83.Fill = false;
+                       global::Gtk.ButtonBox.ButtonBoxChild w72 = 
((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox2 [this.newplayerbutton]));
+                       w72.Position = 1;
+                       w72.Expand = false;
+                       w72.Fill = false;
                        // Container child hbuttonbox2.Gtk.ButtonBox+ButtonBoxChild
                        this.deletebutton = new global::Gtk.Button ();
                        this.deletebutton.CanFocus = true;
                        this.deletebutton.Name = "deletebutton";
                        this.deletebutton.UseUnderline = true;
                        // Container child deletebutton.Gtk.Container+ContainerChild
-                       global::Gtk.Alignment w84 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
+                       global::Gtk.Alignment w73 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
                        // Container child GtkAlignment.Gtk.Container+ContainerChild
-                       global::Gtk.HBox w85 = new global::Gtk.HBox ();
-                       w85.Spacing = 2;
+                       global::Gtk.HBox w74 = new global::Gtk.HBox ();
+                       w74.Spacing = 2;
                        // Container child GtkHBox.Gtk.Container+ContainerChild
-                       global::Gtk.Image w86 = new global::Gtk.Image ();
-                       w86.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-delete", 
global::Gtk.IconSize.Dialog);
-                       w85.Add (w86);
+                       global::Gtk.Image w75 = new global::Gtk.Image ();
+                       w75.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-delete", 
global::Gtk.IconSize.Dialog);
+                       w74.Add (w75);
                        // Container child GtkHBox.Gtk.Container+ContainerChild
-                       global::Gtk.Label w88 = new global::Gtk.Label ();
-                       w88.LabelProp = global::Mono.Unix.Catalog.GetString ("Delete player");
-                       w88.UseUnderline = true;
-                       w85.Add (w88);
-                       w84.Add (w85);
-                       this.deletebutton.Add (w84);
+                       global::Gtk.Label w77 = new global::Gtk.Label ();
+                       w77.LabelProp = global::Mono.Unix.Catalog.GetString ("Delete player");
+                       w77.UseUnderline = true;
+                       w74.Add (w77);
+                       w73.Add (w74);
+                       this.deletebutton.Add (w73);
                        this.hbuttonbox2.Add (this.deletebutton);
-                       global::Gtk.ButtonBox.ButtonBoxChild w92 = 
((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox2 [this.deletebutton]));
-                       w92.Position = 2;
-                       w92.Expand = false;
-                       w92.Fill = false;
+                       global::Gtk.ButtonBox.ButtonBoxChild w81 = 
((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox2 [this.deletebutton]));
+                       w81.Position = 2;
+                       w81.Expand = false;
+                       w81.Fill = false;
                        this.vbox3.Add (this.hbuttonbox2);
-                       global::Gtk.Box.BoxChild w93 = ((global::Gtk.Box.BoxChild)(this.vbox3 
[this.hbuttonbox2]));
-                       w93.Position = 1;
-                       w93.Expand = false;
-                       w93.Fill = false;
+                       global::Gtk.Box.BoxChild w82 = ((global::Gtk.Box.BoxChild)(this.vbox3 
[this.hbuttonbox2]));
+                       w82.Position = 1;
+                       w82.Expand = false;
+                       w82.Fill = false;
                        this.Add (this.vbox3);
                        if ((this.Child != null)) {
                                this.Child.ShowAll ();
                        }
-                       this.warninglabel.Hide ();
                        this.Hide ();
                }
        }
diff --git a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.MainWindow.cs 
b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.MainWindow.cs
index 66be6cd..9ab970a 100644
--- a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.MainWindow.cs
+++ b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.MainWindow.cs
@@ -37,7 +37,7 @@ namespace LongoMatch.Gui
                private global::Gtk.VBox menubox;
                private global::Gtk.MenuBar menubar1;
                private global::Gtk.HBox centralbox;
-               private global::LongoMatch.Gui.Panel.WelcomePanel welcomepanel1;
+               private global::LongoMatch.Gui.Panel.WelcomePanel welcomepanel;
                private global::Gtk.Statusbar statusbar1;
                private global::LongoMatch.Gui.Component.RenderingStateBar renderingstatebar1;
 
@@ -171,11 +171,11 @@ namespace LongoMatch.Gui
                        this.centralbox.Name = "centralbox";
                        this.centralbox.Spacing = 6;
                        // Container child centralbox.Gtk.Box+BoxChild
-                       this.welcomepanel1 = new global::LongoMatch.Gui.Panel.WelcomePanel ();
-                       this.welcomepanel1.Events = ((global::Gdk.EventMask)(256));
-                       this.welcomepanel1.Name = "welcomepanel1";
-                       this.centralbox.Add (this.welcomepanel1);
-                       global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.centralbox 
[this.welcomepanel1]));
+                       this.welcomepanel = new global::LongoMatch.Gui.Panel.WelcomePanel ();
+                       this.welcomepanel.Events = ((global::Gdk.EventMask)(256));
+                       this.welcomepanel.Name = "welcomepanel";
+                       this.centralbox.Add (this.welcomepanel);
+                       global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.centralbox 
[this.welcomepanel]));
                        w4.Position = 0;
                        this.vbox1.Add (this.centralbox);
                        global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox1 
[this.centralbox]));
diff --git a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Panel.NewProjectPanel.cs 
b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Panel.NewProjectPanel.cs
index 1f1d6c4..5ab880c 100644
--- a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Panel.NewProjectPanel.cs
+++ b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Panel.NewProjectPanel.cs
@@ -4,14 +4,17 @@ namespace LongoMatch.Gui.Panel
 {
        public partial class NewProjectPanel
        {
-               private global::Gtk.VBox vbox2;
-               private global::Gtk.HBox hbox3;
-               private global::LongoMatch.Gui.Component.BackgroundWidget backgroundwidget;
-               private global::Gtk.Notebook notebook1;
                private global::Gtk.VBox vbox3;
-               private global::Gtk.Label label6;
+               private global::Gtk.HBox newheaderbox;
+               private global::Gtk.Image logoimage;
+               private global::Gtk.Label titlelabel;
+               private global::Gtk.Button createbutton;
+               private global::Gtk.Button nextroundedbutton;
+               private global::Gtk.Button backrectbutton;
+               private global::Gtk.Notebook notebook1;
+               private global::Gtk.VBox vbox4;
                private global::Gtk.HSeparator hseparator1;
-               private global::Gtk.HBox hbox1;
+               private global::Gtk.HBox hbox20;
                private global::Gtk.RadioButton fromfileradiobutton;
                private global::Gtk.Image image61;
                private global::Gtk.HBox hbox2;
@@ -24,31 +27,25 @@ namespace LongoMatch.Gui.Panel
                private global::Gtk.RadioButton uriliveradiobutton;
                private global::Gtk.Image image64;
                private global::Gtk.Label label1;
-               private global::Gtk.VBox vbox4;
-               private global::Gtk.Label label4;
-               private global::Gtk.HSeparator hseparator2;
-               private global::Gtk.Table table1;
+               private global::Gtk.VBox vbox5;
+               private global::Gtk.Alignment alignment1;
+               private global::Gtk.HBox topbox;
+               private global::Gtk.Table lefttable;
                private global::Gtk.Entry competitionentry;
                private global::Gtk.Label Competitionlabel;
-               private global::Gtk.HBox hbox5;
-               private global::Gtk.Label datelabel;
-               private global::Gtk.Button calendarbutton;
-               private global::Gtk.HBox hbox9;
-               private global::Gtk.SpinButton localSpinButton;
-               private global::Gtk.Label label2;
-               private global::Gtk.SpinButton visitorSpinButton;
-               private global::Gtk.Label label11;
-               private global::Gtk.Label label5;
-               private global::Gtk.Label label9;
+               private global::Gtk.Label datelabel2;
+               private global::LongoMatch.Gui.Component.DatePicker datepicker1;
                private global::Gtk.Entry seasonentry;
                private global::Gtk.Label seasonlabel;
-               private global::Gtk.ComboBox tagscombobox;
-               private global::Gtk.HSeparator hseparator3;
-               private global::Gtk.Table filetable;
-               private global::Gtk.HBox filehbox;
-               private global::Gtk.Entry fileEntry;
-               private global::Gtk.Button openbutton;
+               private global::Gtk.VBox centerbox;
+               private global::Gtk.HBox hbox15;
+               private global::LongoMatch.Gui.Component.TeamsComboBox hometeamscombobox;
+               private global::Gtk.Image vsimage;
+               private global::LongoMatch.Gui.Component.TeamsComboBox awayteamscombobox;
                private global::Gtk.Label filelabel;
+               private global::Gtk.Table filetable;
+               private global::LongoMatch.Gui.Component.MediaFileChooser mediafilechooser1;
+               private global::LongoMatch.Gui.Component.MediaFileChooser mediafilechooser2;
                private global::Gtk.Table outputfiletable;
                private global::Gtk.HBox outputfilehbox1;
                private global::Gtk.Entry outfileEntry;
@@ -67,25 +64,14 @@ namespace LongoMatch.Gui.Panel
                private global::Gtk.Label qualitylabel;
                private global::Gtk.Label sizelabel;
                private global::Gtk.Label videoformatlabel;
-               private global::Gtk.VBox vbox5;
-               private global::Gtk.HBox hbox10;
-               private global::Gtk.Image homeshieldimage;
-               private global::Gtk.Label homelabel;
-               private global::Gtk.ComboBox hometeamscombobox;
-               private global::Gtk.ComboBox awayteamscombobox;
-               private global::Gtk.Label awaylabel;
-               private global::Gtk.Image awayshieldimage;
-               private global::Gtk.DrawingArea drawingarea1;
-               private global::Gtk.Label label3;
+               private global::Gtk.Table righttable;
+               private global::Gtk.Label analysislabel;
+               private global::Gtk.ComboBox tagscombobox;
                private global::Gtk.VBox vbox6;
-               private global::Gtk.Label label8;
-               private global::Gtk.HSeparator hseparator4;
+               private global::Gtk.DrawingArea drawingarea;
+               private global::Gtk.Label label3;
                private global::LongoMatch.Gui.Component.ProjectPeriods projectperiods1;
                private global::Gtk.Label label7;
-               private global::Gtk.HButtonBox hbuttonbox2;
-               private global::Gtk.Button backbutton;
-               private global::Gtk.Button nextbutton;
-               private global::Gtk.Button createbutton;
 
                protected virtual void Build ()
                {
@@ -94,79 +80,157 @@ namespace LongoMatch.Gui.Panel
                        global::Stetic.BinContainer.Attach (this);
                        this.Name = "LongoMatch.Gui.Panel.NewProjectPanel";
                        // Container child LongoMatch.Gui.Panel.NewProjectPanel.Gtk.Container+ContainerChild
-                       this.vbox2 = new global::Gtk.VBox ();
-                       this.vbox2.Name = "vbox2";
-                       this.vbox2.Spacing = 6;
-                       // Container child vbox2.Gtk.Box+BoxChild
-                       this.hbox3 = new global::Gtk.HBox ();
-                       this.hbox3.Name = "hbox3";
-                       this.hbox3.Spacing = 6;
-                       // Container child hbox3.Gtk.Box+BoxChild
-                       this.backgroundwidget = new global::LongoMatch.Gui.Component.BackgroundWidget ();
-                       this.backgroundwidget.Events = ((global::Gdk.EventMask)(256));
-                       this.backgroundwidget.Name = "backgroundwidget";
-                       this.hbox3.Add (this.backgroundwidget);
-                       global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.hbox3 
[this.backgroundwidget]));
+                       this.vbox3 = new global::Gtk.VBox ();
+                       this.vbox3.Name = "vbox3";
+                       // Container child vbox3.Gtk.Box+BoxChild
+                       this.newheaderbox = new global::Gtk.HBox ();
+                       this.newheaderbox.Name = "newheaderbox";
+                       this.newheaderbox.Spacing = 6;
+                       // Container child newheaderbox.Gtk.Box+BoxChild
+                       this.logoimage = new global::Gtk.Image ();
+                       this.logoimage.Name = "logoimage";
+                       this.newheaderbox.Add (this.logoimage);
+                       global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.newheaderbox 
[this.logoimage]));
                        w1.Position = 0;
                        w1.Expand = false;
-                       // Container child hbox3.Gtk.Box+BoxChild
+                       w1.Fill = false;
+                       // Container child newheaderbox.Gtk.Box+BoxChild
+                       this.titlelabel = new global::Gtk.Label ();
+                       this.titlelabel.Name = "titlelabel";
+                       this.titlelabel.Xalign = 0F;
+                       this.titlelabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>PROJECT 
PROPERTIES</b>");
+                       this.titlelabel.UseMarkup = true;
+                       this.titlelabel.Justify = ((global::Gtk.Justification)(2));
+                       this.newheaderbox.Add (this.titlelabel);
+                       global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.newheaderbox 
[this.titlelabel]));
+                       w2.Position = 1;
+                       w2.Expand = false;
+                       // Container child newheaderbox.Gtk.Box+BoxChild
+                       this.createbutton = new global::Gtk.Button ();
+                       this.createbutton.CanFocus = true;
+                       this.createbutton.Name = "createbutton";
+                       this.createbutton.UseUnderline = true;
+                       // Container child createbutton.Gtk.Container+ContainerChild
+                       global::Gtk.Alignment w3 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
+                       // Container child GtkAlignment.Gtk.Container+ContainerChild
+                       global::Gtk.HBox w4 = new global::Gtk.HBox ();
+                       w4.Spacing = 2;
+                       // Container child GtkHBox.Gtk.Container+ContainerChild
+                       global::Gtk.Image w5 = new global::Gtk.Image ();
+                       w5.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-new", 
global::Gtk.IconSize.Dialog);
+                       w4.Add (w5);
+                       // Container child GtkHBox.Gtk.Container+ContainerChild
+                       global::Gtk.Label w7 = new global::Gtk.Label ();
+                       w7.LabelProp = global::Mono.Unix.Catalog.GetString ("Create project");
+                       w7.UseUnderline = true;
+                       w4.Add (w7);
+                       w3.Add (w4);
+                       this.createbutton.Add (w3);
+                       this.newheaderbox.Add (this.createbutton);
+                       global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.newheaderbox 
[this.createbutton]));
+                       w11.PackType = ((global::Gtk.PackType)(1));
+                       w11.Position = 2;
+                       w11.Expand = false;
+                       w11.Fill = false;
+                       // Container child newheaderbox.Gtk.Box+BoxChild
+                       this.nextroundedbutton = new global::Gtk.Button ();
+                       this.nextroundedbutton.CanFocus = true;
+                       this.nextroundedbutton.Name = "nextroundedbutton";
+                       this.nextroundedbutton.UseUnderline = true;
+                       // Container child nextroundedbutton.Gtk.Container+ContainerChild
+                       global::Gtk.Alignment w12 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
+                       // Container child GtkAlignment.Gtk.Container+ContainerChild
+                       global::Gtk.HBox w13 = new global::Gtk.HBox ();
+                       w13.Spacing = 2;
+                       // Container child GtkHBox.Gtk.Container+ContainerChild
+                       global::Gtk.Image w14 = new global::Gtk.Image ();
+                       w14.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "longomatch-apply", 
global::Gtk.IconSize.Dialog);
+                       w13.Add (w14);
+                       // Container child GtkHBox.Gtk.Container+ContainerChild
+                       global::Gtk.Label w16 = new global::Gtk.Label ();
+                       w13.Add (w16);
+                       w12.Add (w13);
+                       this.nextroundedbutton.Add (w12);
+                       this.newheaderbox.Add (this.nextroundedbutton);
+                       global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.newheaderbox 
[this.nextroundedbutton]));
+                       w20.PackType = ((global::Gtk.PackType)(1));
+                       w20.Position = 3;
+                       w20.Expand = false;
+                       // Container child newheaderbox.Gtk.Box+BoxChild
+                       this.backrectbutton = new global::Gtk.Button ();
+                       this.backrectbutton.CanFocus = true;
+                       this.backrectbutton.Name = "backrectbutton";
+                       this.backrectbutton.UseUnderline = true;
+                       // Container child backrectbutton.Gtk.Container+ContainerChild
+                       global::Gtk.Alignment w21 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
+                       // Container child GtkAlignment.Gtk.Container+ContainerChild
+                       global::Gtk.HBox w22 = new global::Gtk.HBox ();
+                       w22.Spacing = 2;
+                       // Container child GtkHBox.Gtk.Container+ContainerChild
+                       global::Gtk.Image w23 = new global::Gtk.Image ();
+                       w23.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "longomatch-back", 
global::Gtk.IconSize.Dialog);
+                       w22.Add (w23);
+                       // Container child GtkHBox.Gtk.Container+ContainerChild
+                       global::Gtk.Label w25 = new global::Gtk.Label ();
+                       w22.Add (w25);
+                       w21.Add (w22);
+                       this.backrectbutton.Add (w21);
+                       this.newheaderbox.Add (this.backrectbutton);
+                       global::Gtk.Box.BoxChild w29 = ((global::Gtk.Box.BoxChild)(this.newheaderbox 
[this.backrectbutton]));
+                       w29.PackType = ((global::Gtk.PackType)(1));
+                       w29.Position = 4;
+                       w29.Expand = false;
+                       w29.Fill = false;
+                       this.vbox3.Add (this.newheaderbox);
+                       global::Gtk.Box.BoxChild w30 = ((global::Gtk.Box.BoxChild)(this.vbox3 
[this.newheaderbox]));
+                       w30.Position = 0;
+                       w30.Expand = false;
+                       w30.Fill = false;
+                       // Container child vbox3.Gtk.Box+BoxChild
                        this.notebook1 = new global::Gtk.Notebook ();
                        this.notebook1.CanFocus = true;
                        this.notebook1.Name = "notebook1";
-                       this.notebook1.CurrentPage = 2;
+                       this.notebook1.CurrentPage = 1;
                        this.notebook1.ShowBorder = false;
                        this.notebook1.Scrollable = true;
                        // Container child notebook1.Gtk.Notebook+NotebookChild
-                       this.vbox3 = new global::Gtk.VBox ();
-                       this.vbox3.Name = "vbox3";
-                       this.vbox3.Spacing = 6;
-                       // Container child vbox3.Gtk.Box+BoxChild
-                       this.label6 = new global::Gtk.Label ();
-                       this.label6.Name = "label6";
-                       this.label6.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Select new project 
type</b>");
-                       this.label6.UseMarkup = true;
-                       this.label6.Justify = ((global::Gtk.Justification)(2));
-                       this.vbox3.Add (this.label6);
-                       global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.label6]));
-                       w2.Position = 0;
-                       w2.Expand = false;
-                       w2.Fill = false;
-                       w2.Padding = ((uint)(30));
-                       // Container child vbox3.Gtk.Box+BoxChild
+                       this.vbox4 = new global::Gtk.VBox ();
+                       this.vbox4.Name = "vbox4";
+                       this.vbox4.Spacing = 6;
+                       // Container child vbox4.Gtk.Box+BoxChild
                        this.hseparator1 = new global::Gtk.HSeparator ();
                        this.hseparator1.Name = "hseparator1";
-                       this.vbox3.Add (this.hseparator1);
-                       global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox3 
[this.hseparator1]));
-                       w3.Position = 1;
-                       w3.Expand = false;
-                       w3.Fill = false;
-                       // Container child vbox3.Gtk.Box+BoxChild
-                       this.hbox1 = new global::Gtk.HBox ();
-                       this.hbox1.Name = "hbox1";
-                       this.hbox1.Spacing = 6;
-                       // Container child hbox1.Gtk.Box+BoxChild
+                       this.vbox4.Add (this.hseparator1);
+                       global::Gtk.Box.BoxChild w31 = ((global::Gtk.Box.BoxChild)(this.vbox4 
[this.hseparator1]));
+                       w31.Position = 0;
+                       w31.Expand = false;
+                       w31.Fill = false;
+                       // Container child vbox4.Gtk.Box+BoxChild
+                       this.hbox20 = new global::Gtk.HBox ();
+                       this.hbox20.Name = "hbox20";
+                       this.hbox20.Spacing = 6;
+                       // Container child hbox20.Gtk.Box+BoxChild
                        this.fromfileradiobutton = new global::Gtk.RadioButton 
(global::Mono.Unix.Catalog.GetString ("New project using a video file"));
                        this.fromfileradiobutton.CanFocus = true;
                        this.fromfileradiobutton.Name = "fromfileradiobutton";
-                       this.fromfileradiobutton.Active = true;
                        this.fromfileradiobutton.DrawIndicator = true;
                        this.fromfileradiobutton.UseUnderline = true;
                        this.fromfileradiobutton.FocusOnClick = false;
                        this.fromfileradiobutton.Group = new global::GLib.SList (global::System.IntPtr.Zero);
-                       this.hbox1.Add (this.fromfileradiobutton);
-                       global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1 
[this.fromfileradiobutton]));
-                       w4.Position = 0;
-                       // Container child hbox1.Gtk.Box+BoxChild
+                       this.hbox20.Add (this.fromfileradiobutton);
+                       global::Gtk.Box.BoxChild w32 = ((global::Gtk.Box.BoxChild)(this.hbox20 
[this.fromfileradiobutton]));
+                       w32.Position = 0;
+                       // Container child hbox20.Gtk.Box+BoxChild
                        this.image61 = new global::Gtk.Image ();
                        this.image61.Name = "image61";
                        this.image61.Pixbuf = global::Gdk.Pixbuf.LoadFromResource ("video.png");
-                       this.hbox1.Add (this.image61);
-                       global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.image61]));
-                       w5.Position = 1;
-                       this.vbox3.Add (this.hbox1);
-                       global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.hbox1]));
-                       w6.Position = 2;
-                       // Container child vbox3.Gtk.Box+BoxChild
+                       this.hbox20.Add (this.image61);
+                       global::Gtk.Box.BoxChild w33 = ((global::Gtk.Box.BoxChild)(this.hbox20 
[this.image61]));
+                       w33.Position = 1;
+                       this.vbox4.Add (this.hbox20);
+                       global::Gtk.Box.BoxChild w34 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.hbox20]));
+                       w34.Position = 1;
+                       // Container child vbox4.Gtk.Box+BoxChild
                        this.hbox2 = new global::Gtk.HBox ();
                        this.hbox2.Name = "hbox2";
                        this.hbox2.Spacing = 6;
@@ -178,19 +242,19 @@ namespace LongoMatch.Gui.Panel
                        this.liveradiobutton.UseUnderline = true;
                        this.liveradiobutton.Group = this.fromfileradiobutton.Group;
                        this.hbox2.Add (this.liveradiobutton);
-                       global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.hbox2 
[this.liveradiobutton]));
-                       w7.Position = 0;
+                       global::Gtk.Box.BoxChild w35 = ((global::Gtk.Box.BoxChild)(this.hbox2 
[this.liveradiobutton]));
+                       w35.Position = 0;
                        // Container child hbox2.Gtk.Box+BoxChild
                        this.image63 = new global::Gtk.Image ();
                        this.image63.Name = "image63";
                        this.image63.Pixbuf = global::Gdk.Pixbuf.LoadFromResource ("camera-video.png");
                        this.hbox2.Add (this.image63);
-                       global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.image63]));
-                       w8.Position = 1;
-                       this.vbox3.Add (this.hbox2);
-                       global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.hbox2]));
-                       w9.Position = 3;
-                       // Container child vbox3.Gtk.Box+BoxChild
+                       global::Gtk.Box.BoxChild w36 = ((global::Gtk.Box.BoxChild)(this.hbox2 
[this.image63]));
+                       w36.Position = 1;
+                       this.vbox4.Add (this.hbox2);
+                       global::Gtk.Box.BoxChild w37 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.hbox2]));
+                       w37.Position = 2;
+                       // Container child vbox4.Gtk.Box+BoxChild
                        this.hbox4 = new global::Gtk.HBox ();
                        this.hbox4.Name = "hbox4";
                        this.hbox4.Spacing = 6;
@@ -202,19 +266,19 @@ namespace LongoMatch.Gui.Panel
                        this.fakeliveradiobutton.UseUnderline = true;
                        this.fakeliveradiobutton.Group = this.fromfileradiobutton.Group;
                        this.hbox4.Add (this.fakeliveradiobutton);
-                       global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox4 
[this.fakeliveradiobutton]));
-                       w10.Position = 0;
+                       global::Gtk.Box.BoxChild w38 = ((global::Gtk.Box.BoxChild)(this.hbox4 
[this.fakeliveradiobutton]));
+                       w38.Position = 0;
                        // Container child hbox4.Gtk.Box+BoxChild
                        this.image62 = new global::Gtk.Image ();
                        this.image62.Name = "image62";
                        this.image62.Pixbuf = global::Gdk.Pixbuf.LoadFromResource ("camera-video.png");
                        this.hbox4.Add (this.image62);
-                       global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox4 
[this.image62]));
-                       w11.Position = 1;
-                       this.vbox3.Add (this.hbox4);
-                       global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.hbox4]));
-                       w12.Position = 4;
-                       // Container child vbox3.Gtk.Box+BoxChild
+                       global::Gtk.Box.BoxChild w39 = ((global::Gtk.Box.BoxChild)(this.hbox4 
[this.image62]));
+                       w39.Position = 1;
+                       this.vbox4.Add (this.hbox4);
+                       global::Gtk.Box.BoxChild w40 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.hbox4]));
+                       w40.Position = 3;
+                       // Container child vbox4.Gtk.Box+BoxChild
                        this.ipcamerabox = new global::Gtk.HBox ();
                        this.ipcamerabox.Name = "ipcamerabox";
                        this.ipcamerabox.Spacing = 6;
@@ -226,296 +290,187 @@ namespace LongoMatch.Gui.Panel
                        this.uriliveradiobutton.UseUnderline = true;
                        this.uriliveradiobutton.Group = this.fromfileradiobutton.Group;
                        this.ipcamerabox.Add (this.uriliveradiobutton);
-                       global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.ipcamerabox 
[this.uriliveradiobutton]));
-                       w13.Position = 0;
+                       global::Gtk.Box.BoxChild w41 = ((global::Gtk.Box.BoxChild)(this.ipcamerabox 
[this.uriliveradiobutton]));
+                       w41.Position = 0;
                        // Container child ipcamerabox.Gtk.Box+BoxChild
                        this.image64 = new global::Gtk.Image ();
                        this.image64.Name = "image64";
                        this.image64.Pixbuf = global::Gdk.Pixbuf.LoadFromResource ("camera-video.png");
                        this.ipcamerabox.Add (this.image64);
-                       global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.ipcamerabox 
[this.image64]));
-                       w14.Position = 1;
-                       this.vbox3.Add (this.ipcamerabox);
-                       global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox3 
[this.ipcamerabox]));
-                       w15.Position = 5;
-                       this.notebook1.Add (this.vbox3);
+                       global::Gtk.Box.BoxChild w42 = ((global::Gtk.Box.BoxChild)(this.ipcamerabox 
[this.image64]));
+                       w42.Position = 1;
+                       this.vbox4.Add (this.ipcamerabox);
+                       global::Gtk.Box.BoxChild w43 = ((global::Gtk.Box.BoxChild)(this.vbox4 
[this.ipcamerabox]));
+                       w43.Position = 4;
+                       this.notebook1.Add (this.vbox4);
                        // Notebook tab
                        this.label1 = new global::Gtk.Label ();
                        this.label1.Name = "label1";
                        this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("page1");
-                       this.notebook1.SetTabLabel (this.vbox3, this.label1);
+                       this.notebook1.SetTabLabel (this.vbox4, this.label1);
                        this.label1.ShowAll ();
                        // Container child notebook1.Gtk.Notebook+NotebookChild
-                       this.vbox4 = new global::Gtk.VBox ();
-                       this.vbox4.Name = "vbox4";
-                       this.vbox4.Spacing = 6;
-                       // Container child vbox4.Gtk.Box+BoxChild
-                       this.label4 = new global::Gtk.Label ();
-                       this.label4.Name = "label4";
-                       this.label4.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Project 
properties</b>");
-                       this.label4.UseMarkup = true;
-                       this.label4.Justify = ((global::Gtk.Justification)(2));
-                       this.vbox4.Add (this.label4);
-                       global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.label4]));
-                       w17.Position = 0;
-                       w17.Expand = false;
-                       w17.Padding = ((uint)(20));
-                       // Container child vbox4.Gtk.Box+BoxChild
-                       this.hseparator2 = new global::Gtk.HSeparator ();
-                       this.hseparator2.Name = "hseparator2";
-                       this.vbox4.Add (this.hseparator2);
-                       global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.vbox4 
[this.hseparator2]));
-                       w18.Position = 1;
-                       w18.Expand = false;
-                       w18.Fill = false;
-                       // Container child vbox4.Gtk.Box+BoxChild
-                       this.table1 = new global::Gtk.Table (((uint)(3)), ((uint)(4)), true);
-                       this.table1.Name = "table1";
-                       this.table1.RowSpacing = ((uint)(6));
-                       this.table1.ColumnSpacing = ((uint)(6));
-                       // Container child table1.Gtk.Table+TableChild
+                       this.vbox5 = new global::Gtk.VBox ();
+                       this.vbox5.Name = "vbox5";
+                       this.vbox5.Spacing = 6;
+                       // Container child vbox5.Gtk.Box+BoxChild
+                       this.alignment1 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
+                       this.alignment1.Name = "alignment1";
+                       // Container child alignment1.Gtk.Container+ContainerChild
+                       this.topbox = new global::Gtk.HBox ();
+                       this.topbox.Name = "topbox";
+                       this.topbox.Spacing = 6;
+                       // Container child topbox.Gtk.Box+BoxChild
+                       this.lefttable = new global::Gtk.Table (((uint)(3)), ((uint)(2)), false);
+                       this.lefttable.Name = "lefttable";
+                       this.lefttable.RowSpacing = ((uint)(6));
+                       this.lefttable.ColumnSpacing = ((uint)(6));
+                       // Container child lefttable.Gtk.Table+TableChild
                        this.competitionentry = new global::Gtk.Entry ();
                        this.competitionentry.CanFocus = true;
                        this.competitionentry.Name = "competitionentry";
                        this.competitionentry.IsEditable = true;
                        this.competitionentry.InvisibleChar = '●';
-                       this.table1.Add (this.competitionentry);
-                       global::Gtk.Table.TableChild w19 = ((global::Gtk.Table.TableChild)(this.table1 
[this.competitionentry]));
-                       w19.LeftAttach = ((uint)(3));
-                       w19.RightAttach = ((uint)(4));
-                       w19.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w19.YOptions = ((global::Gtk.AttachOptions)(4));
-                       // Container child table1.Gtk.Table+TableChild
+                       this.lefttable.Add (this.competitionentry);
+                       global::Gtk.Table.TableChild w45 = ((global::Gtk.Table.TableChild)(this.lefttable 
[this.competitionentry]));
+                       w45.TopAttach = ((uint)(1));
+                       w45.BottomAttach = ((uint)(2));
+                       w45.LeftAttach = ((uint)(1));
+                       w45.RightAttach = ((uint)(2));
+                       w45.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w45.YOptions = ((global::Gtk.AttachOptions)(4));
+                       // Container child lefttable.Gtk.Table+TableChild
                        this.Competitionlabel = new global::Gtk.Label ();
                        this.Competitionlabel.Name = "Competitionlabel";
-                       this.Competitionlabel.LabelProp = global::Mono.Unix.Catalog.GetString 
("Competition:");
-                       this.table1.Add (this.Competitionlabel);
-                       global::Gtk.Table.TableChild w20 = ((global::Gtk.Table.TableChild)(this.table1 
[this.Competitionlabel]));
-                       w20.LeftAttach = ((uint)(2));
-                       w20.RightAttach = ((uint)(3));
-                       w20.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w20.YOptions = ((global::Gtk.AttachOptions)(4));
-                       // Container child table1.Gtk.Table+TableChild
-                       this.hbox5 = new global::Gtk.HBox ();
-                       this.hbox5.Name = "hbox5";
-                       // Container child hbox5.Gtk.Box+BoxChild
-                       this.datelabel = new global::Gtk.Label ();
-                       this.datelabel.Name = "datelabel";
-                       this.hbox5.Add (this.datelabel);
-                       global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.hbox5 
[this.datelabel]));
-                       w21.Position = 0;
-                       w21.Fill = false;
-                       // Container child hbox5.Gtk.Box+BoxChild
-                       this.calendarbutton = new global::Gtk.Button ();
-                       this.calendarbutton.CanFocus = true;
-                       this.calendarbutton.Name = "calendarbutton";
-                       this.calendarbutton.UseUnderline = true;
-                       // Container child calendarbutton.Gtk.Container+ContainerChild
-                       global::Gtk.Alignment w22 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
-                       // Container child GtkAlignment.Gtk.Container+ContainerChild
-                       global::Gtk.HBox w23 = new global::Gtk.HBox ();
-                       w23.Spacing = 2;
-                       // Container child GtkHBox.Gtk.Container+ContainerChild
-                       global::Gtk.Image w24 = new global::Gtk.Image ();
-                       w24.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "stock_calendar", 
global::Gtk.IconSize.Button);
-                       w23.Add (w24);
-                       // Container child GtkHBox.Gtk.Container+ContainerChild
-                       global::Gtk.Label w26 = new global::Gtk.Label ();
-                       w23.Add (w26);
-                       w22.Add (w23);
-                       this.calendarbutton.Add (w22);
-                       this.hbox5.Add (this.calendarbutton);
-                       global::Gtk.Box.BoxChild w30 = ((global::Gtk.Box.BoxChild)(this.hbox5 
[this.calendarbutton]));
-                       w30.Position = 1;
-                       w30.Expand = false;
-                       w30.Fill = false;
-                       this.table1.Add (this.hbox5);
-                       global::Gtk.Table.TableChild w31 = ((global::Gtk.Table.TableChild)(this.table1 
[this.hbox5]));
-                       w31.TopAttach = ((uint)(1));
-                       w31.BottomAttach = ((uint)(2));
-                       w31.LeftAttach = ((uint)(3));
-                       w31.RightAttach = ((uint)(4));
-                       w31.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w31.YOptions = ((global::Gtk.AttachOptions)(4));
-                       // Container child table1.Gtk.Table+TableChild
-                       this.hbox9 = new global::Gtk.HBox ();
-                       this.hbox9.Name = "hbox9";
-                       this.hbox9.Spacing = 6;
-                       // Container child hbox9.Gtk.Box+BoxChild
-                       this.localSpinButton = new global::Gtk.SpinButton (0, 1000, 1);
-                       this.localSpinButton.CanFocus = true;
-                       this.localSpinButton.Name = "localSpinButton";
-                       this.localSpinButton.Adjustment.PageIncrement = 10;
-                       this.localSpinButton.ClimbRate = 1;
-                       this.localSpinButton.Numeric = true;
-                       this.hbox9.Add (this.localSpinButton);
-                       global::Gtk.Box.BoxChild w32 = ((global::Gtk.Box.BoxChild)(this.hbox9 
[this.localSpinButton]));
-                       w32.Position = 0;
-                       w32.Fill = false;
-                       // Container child hbox9.Gtk.Box+BoxChild
-                       this.label2 = new global::Gtk.Label ();
-                       this.label2.Name = "label2";
-                       this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("-");
-                       this.hbox9.Add (this.label2);
-                       global::Gtk.Box.BoxChild w33 = ((global::Gtk.Box.BoxChild)(this.hbox9 [this.label2]));
-                       w33.Position = 1;
-                       w33.Expand = false;
-                       w33.Fill = false;
-                       // Container child hbox9.Gtk.Box+BoxChild
-                       this.visitorSpinButton = new global::Gtk.SpinButton (0, 1000, 1);
-                       this.visitorSpinButton.CanFocus = true;
-                       this.visitorSpinButton.Name = "visitorSpinButton";
-                       this.visitorSpinButton.Adjustment.PageIncrement = 10;
-                       this.visitorSpinButton.ClimbRate = 1;
-                       this.visitorSpinButton.Numeric = true;
-                       this.hbox9.Add (this.visitorSpinButton);
-                       global::Gtk.Box.BoxChild w34 = ((global::Gtk.Box.BoxChild)(this.hbox9 
[this.visitorSpinButton]));
-                       w34.Position = 2;
-                       w34.Fill = false;
-                       this.table1.Add (this.hbox9);
-                       global::Gtk.Table.TableChild w35 = ((global::Gtk.Table.TableChild)(this.table1 
[this.hbox9]));
-                       w35.TopAttach = ((uint)(1));
-                       w35.BottomAttach = ((uint)(2));
-                       w35.LeftAttach = ((uint)(1));
-                       w35.RightAttach = ((uint)(2));
-                       w35.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w35.YOptions = ((global::Gtk.AttachOptions)(4));
-                       // Container child table1.Gtk.Table+TableChild
-                       this.label11 = new global::Gtk.Label ();
-                       this.label11.Name = "label11";
-                       this.label11.LabelProp = global::Mono.Unix.Catalog.GetString ("Score:");
-                       this.table1.Add (this.label11);
-                       global::Gtk.Table.TableChild w36 = ((global::Gtk.Table.TableChild)(this.table1 
[this.label11]));
-                       w36.TopAttach = ((uint)(1));
-                       w36.BottomAttach = ((uint)(2));
-                       w36.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w36.YOptions = ((global::Gtk.AttachOptions)(4));
-                       // Container child table1.Gtk.Table+TableChild
-                       this.label5 = new global::Gtk.Label ();
-                       this.label5.Name = "label5";
-                       this.label5.LabelProp = global::Mono.Unix.Catalog.GetString ("Date:");
-                       this.table1.Add (this.label5);
-                       global::Gtk.Table.TableChild w37 = ((global::Gtk.Table.TableChild)(this.table1 
[this.label5]));
-                       w37.TopAttach = ((uint)(1));
-                       w37.BottomAttach = ((uint)(2));
-                       w37.LeftAttach = ((uint)(2));
-                       w37.RightAttach = ((uint)(3));
-                       w37.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w37.YOptions = ((global::Gtk.AttachOptions)(4));
-                       // Container child table1.Gtk.Table+TableChild
-                       this.label9 = new global::Gtk.Label ();
-                       this.label9.Name = "label9";
-                       this.label9.LabelProp = global::Mono.Unix.Catalog.GetString ("Analisys Template:");
-                       this.table1.Add (this.label9);
-                       global::Gtk.Table.TableChild w38 = ((global::Gtk.Table.TableChild)(this.table1 
[this.label9]));
-                       w38.TopAttach = ((uint)(2));
-                       w38.BottomAttach = ((uint)(3));
-                       w38.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w38.YOptions = ((global::Gtk.AttachOptions)(4));
-                       // Container child table1.Gtk.Table+TableChild
+                       this.Competitionlabel.Xalign = 1F;
+                       this.Competitionlabel.LabelProp = global::Mono.Unix.Catalog.GetString ("Competition");
+                       this.lefttable.Add (this.Competitionlabel);
+                       global::Gtk.Table.TableChild w46 = ((global::Gtk.Table.TableChild)(this.lefttable 
[this.Competitionlabel]));
+                       w46.TopAttach = ((uint)(1));
+                       w46.BottomAttach = ((uint)(2));
+                       w46.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w46.YOptions = ((global::Gtk.AttachOptions)(4));
+                       // Container child lefttable.Gtk.Table+TableChild
+                       this.datelabel2 = new global::Gtk.Label ();
+                       this.datelabel2.Name = "datelabel2";
+                       this.datelabel2.Xalign = 1F;
+                       this.datelabel2.LabelProp = global::Mono.Unix.Catalog.GetString ("Date");
+                       this.lefttable.Add (this.datelabel2);
+                       global::Gtk.Table.TableChild w47 = ((global::Gtk.Table.TableChild)(this.lefttable 
[this.datelabel2]));
+                       w47.TopAttach = ((uint)(2));
+                       w47.BottomAttach = ((uint)(3));
+                       w47.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w47.YOptions = ((global::Gtk.AttachOptions)(4));
+                       // Container child lefttable.Gtk.Table+TableChild
+                       this.datepicker1 = new global::LongoMatch.Gui.Component.DatePicker ();
+                       this.datepicker1.Events = ((global::Gdk.EventMask)(256));
+                       this.datepicker1.Name = "datepicker1";
+                       this.datepicker1.Date = new global::System.DateTime (0);
+                       this.lefttable.Add (this.datepicker1);
+                       global::Gtk.Table.TableChild w48 = ((global::Gtk.Table.TableChild)(this.lefttable 
[this.datepicker1]));
+                       w48.TopAttach = ((uint)(2));
+                       w48.BottomAttach = ((uint)(3));
+                       w48.LeftAttach = ((uint)(1));
+                       w48.RightAttach = ((uint)(2));
+                       w48.XOptions = ((global::Gtk.AttachOptions)(0));
+                       w48.YOptions = ((global::Gtk.AttachOptions)(0));
+                       // Container child lefttable.Gtk.Table+TableChild
                        this.seasonentry = new global::Gtk.Entry ();
                        this.seasonentry.CanFocus = true;
                        this.seasonentry.Name = "seasonentry";
                        this.seasonentry.IsEditable = true;
                        this.seasonentry.InvisibleChar = '●';
-                       this.table1.Add (this.seasonentry);
-                       global::Gtk.Table.TableChild w39 = ((global::Gtk.Table.TableChild)(this.table1 
[this.seasonentry]));
-                       w39.LeftAttach = ((uint)(1));
-                       w39.RightAttach = ((uint)(2));
-                       w39.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w39.YOptions = ((global::Gtk.AttachOptions)(4));
-                       // Container child table1.Gtk.Table+TableChild
+                       this.lefttable.Add (this.seasonentry);
+                       global::Gtk.Table.TableChild w49 = ((global::Gtk.Table.TableChild)(this.lefttable 
[this.seasonentry]));
+                       w49.LeftAttach = ((uint)(1));
+                       w49.RightAttach = ((uint)(2));
+                       w49.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w49.YOptions = ((global::Gtk.AttachOptions)(4));
+                       // Container child lefttable.Gtk.Table+TableChild
                        this.seasonlabel = new global::Gtk.Label ();
                        this.seasonlabel.Name = "seasonlabel";
-                       this.seasonlabel.LabelProp = global::Mono.Unix.Catalog.GetString ("Season:");
-                       this.table1.Add (this.seasonlabel);
-                       global::Gtk.Table.TableChild w40 = ((global::Gtk.Table.TableChild)(this.table1 
[this.seasonlabel]));
-                       w40.YOptions = ((global::Gtk.AttachOptions)(4));
-                       // Container child table1.Gtk.Table+TableChild
-                       this.tagscombobox = global::Gtk.ComboBox.NewText ();
-                       this.tagscombobox.Name = "tagscombobox";
-                       this.table1.Add (this.tagscombobox);
-                       global::Gtk.Table.TableChild w41 = ((global::Gtk.Table.TableChild)(this.table1 
[this.tagscombobox]));
-                       w41.TopAttach = ((uint)(2));
-                       w41.BottomAttach = ((uint)(3));
-                       w41.LeftAttach = ((uint)(1));
-                       w41.RightAttach = ((uint)(2));
-                       w41.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w41.YOptions = ((global::Gtk.AttachOptions)(4));
-                       this.vbox4.Add (this.table1);
-                       global::Gtk.Box.BoxChild w42 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.table1]));
-                       w42.Position = 2;
-                       w42.Expand = false;
-                       // Container child vbox4.Gtk.Box+BoxChild
-                       this.hseparator3 = new global::Gtk.HSeparator ();
-                       this.hseparator3.Name = "hseparator3";
-                       this.vbox4.Add (this.hseparator3);
-                       global::Gtk.Box.BoxChild w43 = ((global::Gtk.Box.BoxChild)(this.vbox4 
[this.hseparator3]));
-                       w43.Position = 3;
-                       w43.Expand = false;
-                       w43.Fill = false;
-                       // Container child vbox4.Gtk.Box+BoxChild
-                       this.filetable = new global::Gtk.Table (((uint)(1)), ((uint)(4)), true);
-                       this.filetable.Name = "filetable";
-                       this.filetable.RowSpacing = ((uint)(6));
-                       this.filetable.ColumnSpacing = ((uint)(6));
-                       // Container child filetable.Gtk.Table+TableChild
-                       this.filehbox = new global::Gtk.HBox ();
-                       this.filehbox.Name = "filehbox";
-                       this.filehbox.Spacing = 6;
-                       // Container child filehbox.Gtk.Box+BoxChild
-                       this.fileEntry = new global::Gtk.Entry ();
-                       this.fileEntry.CanFocus = true;
-                       this.fileEntry.Name = "fileEntry";
-                       this.fileEntry.IsEditable = false;
-                       this.fileEntry.HasFrame = false;
-                       this.fileEntry.InvisibleChar = '●';
-                       this.filehbox.Add (this.fileEntry);
-                       global::Gtk.Box.BoxChild w44 = ((global::Gtk.Box.BoxChild)(this.filehbox 
[this.fileEntry]));
-                       w44.Position = 0;
-                       // Container child filehbox.Gtk.Box+BoxChild
-                       this.openbutton = new global::Gtk.Button ();
-                       this.openbutton.CanFocus = true;
-                       this.openbutton.Name = "openbutton";
-                       this.openbutton.UseUnderline = true;
-                       // Container child openbutton.Gtk.Container+ContainerChild
-                       global::Gtk.Alignment w45 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
-                       // Container child GtkAlignment.Gtk.Container+ContainerChild
-                       global::Gtk.HBox w46 = new global::Gtk.HBox ();
-                       w46.Spacing = 2;
-                       // Container child GtkHBox.Gtk.Container+ContainerChild
-                       global::Gtk.Image w47 = new global::Gtk.Image ();
-                       w47.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-open", 
global::Gtk.IconSize.Menu);
-                       w46.Add (w47);
-                       // Container child GtkHBox.Gtk.Container+ContainerChild
-                       global::Gtk.Label w49 = new global::Gtk.Label ();
-                       w46.Add (w49);
-                       w45.Add (w46);
-                       this.openbutton.Add (w45);
-                       this.filehbox.Add (this.openbutton);
-                       global::Gtk.Box.BoxChild w53 = ((global::Gtk.Box.BoxChild)(this.filehbox 
[this.openbutton]));
+                       this.seasonlabel.Xalign = 1F;
+                       this.seasonlabel.LabelProp = global::Mono.Unix.Catalog.GetString ("Season");
+                       this.lefttable.Add (this.seasonlabel);
+                       global::Gtk.Table.TableChild w50 = ((global::Gtk.Table.TableChild)(this.lefttable 
[this.seasonlabel]));
+                       w50.YOptions = ((global::Gtk.AttachOptions)(4));
+                       this.topbox.Add (this.lefttable);
+                       global::Gtk.Box.BoxChild w51 = ((global::Gtk.Box.BoxChild)(this.topbox 
[this.lefttable]));
+                       w51.Position = 0;
+                       w51.Expand = false;
+                       w51.Fill = false;
+                       // Container child topbox.Gtk.Box+BoxChild
+                       this.centerbox = new global::Gtk.VBox ();
+                       this.centerbox.WidthRequest = 500;
+                       this.centerbox.Name = "centerbox";
+                       this.centerbox.Spacing = 6;
+                       // Container child centerbox.Gtk.Box+BoxChild
+                       this.hbox15 = new global::Gtk.HBox ();
+                       this.hbox15.HeightRequest = 60;
+                       this.hbox15.Name = "hbox15";
+                       // Container child hbox15.Gtk.Box+BoxChild
+                       this.hometeamscombobox = new global::LongoMatch.Gui.Component.TeamsComboBox ();
+                       this.hometeamscombobox.Events = ((global::Gdk.EventMask)(256));
+                       this.hometeamscombobox.Name = "hometeamscombobox";
+                       this.hbox15.Add (this.hometeamscombobox);
+                       global::Gtk.Box.BoxChild w52 = ((global::Gtk.Box.BoxChild)(this.hbox15 
[this.hometeamscombobox]));
+                       w52.Position = 0;
+                       // Container child hbox15.Gtk.Box+BoxChild
+                       this.vsimage = new global::Gtk.Image ();
+                       this.vsimage.Name = "vsimage";
+                       this.vsimage.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "longomatch-vs", 
global::Gtk.IconSize.Dialog);
+                       this.hbox15.Add (this.vsimage);
+                       global::Gtk.Box.BoxChild w53 = ((global::Gtk.Box.BoxChild)(this.hbox15 
[this.vsimage]));
                        w53.Position = 1;
                        w53.Expand = false;
-                       this.filetable.Add (this.filehbox);
-                       global::Gtk.Table.TableChild w54 = ((global::Gtk.Table.TableChild)(this.filetable 
[this.filehbox]));
-                       w54.LeftAttach = ((uint)(1));
-                       w54.RightAttach = ((uint)(2));
-                       w54.YOptions = ((global::Gtk.AttachOptions)(4));
-                       // Container child filetable.Gtk.Table+TableChild
+                       w53.Fill = false;
+                       // Container child hbox15.Gtk.Box+BoxChild
+                       this.awayteamscombobox = new global::LongoMatch.Gui.Component.TeamsComboBox ();
+                       this.awayteamscombobox.Name = "awayteamscombobox";
+                       this.hbox15.Add (this.awayteamscombobox);
+                       global::Gtk.Box.BoxChild w54 = ((global::Gtk.Box.BoxChild)(this.hbox15 
[this.awayteamscombobox]));
+                       w54.Position = 2;
+                       this.centerbox.Add (this.hbox15);
+                       global::Gtk.Box.BoxChild w55 = ((global::Gtk.Box.BoxChild)(this.centerbox 
[this.hbox15]));
+                       w55.Position = 0;
+                       w55.Expand = false;
+                       w55.Fill = false;
+                       // Container child centerbox.Gtk.Box+BoxChild
                        this.filelabel = new global::Gtk.Label ();
                        this.filelabel.Name = "filelabel";
-                       this.filelabel.LabelProp = global::Mono.Unix.Catalog.GetString ("File:");
-                       this.filetable.Add (this.filelabel);
-                       global::Gtk.Table.TableChild w55 = ((global::Gtk.Table.TableChild)(this.filetable 
[this.filelabel]));
-                       w55.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w55.YOptions = ((global::Gtk.AttachOptions)(4));
-                       this.vbox4.Add (this.filetable);
-                       global::Gtk.Box.BoxChild w56 = ((global::Gtk.Box.BoxChild)(this.vbox4 
[this.filetable]));
-                       w56.Position = 4;
+                       this.filelabel.Xalign = 0F;
+                       this.filelabel.LabelProp = global::Mono.Unix.Catalog.GetString ("Video files");
+                       this.centerbox.Add (this.filelabel);
+                       global::Gtk.Box.BoxChild w56 = ((global::Gtk.Box.BoxChild)(this.centerbox 
[this.filelabel]));
+                       w56.Position = 1;
                        w56.Expand = false;
                        w56.Fill = false;
-                       // Container child vbox4.Gtk.Box+BoxChild
-                       this.outputfiletable = new global::Gtk.Table (((uint)(1)), ((uint)(4)), true);
+                       // Container child centerbox.Gtk.Box+BoxChild
+                       this.filetable = new global::Gtk.Table (((uint)(2)), ((uint)(2)), false);
+                       this.filetable.Name = "filetable";
+                       this.filetable.RowSpacing = ((uint)(6));
+                       this.filetable.ColumnSpacing = ((uint)(6));
+                       // Container child filetable.Gtk.Table+TableChild
+                       this.mediafilechooser1 = new global::LongoMatch.Gui.Component.MediaFileChooser ();
+                       this.mediafilechooser1.Events = ((global::Gdk.EventMask)(256));
+                       this.mediafilechooser1.Name = "mediafilechooser1";
+                       this.filetable.Add (this.mediafilechooser1);
+                       global::Gtk.Table.TableChild w57 = ((global::Gtk.Table.TableChild)(this.filetable 
[this.mediafilechooser1]));
+                       w57.YOptions = ((global::Gtk.AttachOptions)(4));
+                       // Container child filetable.Gtk.Table+TableChild
+                       this.mediafilechooser2 = new global::LongoMatch.Gui.Component.MediaFileChooser ();
+                       this.mediafilechooser2.Events = ((global::Gdk.EventMask)(256));
+                       this.mediafilechooser2.Name = "mediafilechooser2";
+                       this.filetable.Add (this.mediafilechooser2);
+                       global::Gtk.Table.TableChild w58 = ((global::Gtk.Table.TableChild)(this.filetable 
[this.mediafilechooser2]));
+                       w58.LeftAttach = ((uint)(1));
+                       w58.RightAttach = ((uint)(2));
+                       w58.YOptions = ((global::Gtk.AttachOptions)(4));
+                       this.centerbox.Add (this.filetable);
+                       global::Gtk.Box.BoxChild w59 = ((global::Gtk.Box.BoxChild)(this.centerbox 
[this.filetable]));
+                       w59.Position = 2;
+                       // Container child centerbox.Gtk.Box+BoxChild
+                       this.outputfiletable = new global::Gtk.Table (((uint)(1)), ((uint)(2)), false);
                        this.outputfiletable.Name = "outputfiletable";
                        this.outputfiletable.RowSpacing = ((uint)(6));
                        this.outputfiletable.ColumnSpacing = ((uint)(6));
@@ -531,50 +486,50 @@ namespace LongoMatch.Gui.Panel
                        this.outfileEntry.HasFrame = false;
                        this.outfileEntry.InvisibleChar = '●';
                        this.outputfilehbox1.Add (this.outfileEntry);
-                       global::Gtk.Box.BoxChild w57 = ((global::Gtk.Box.BoxChild)(this.outputfilehbox1 
[this.outfileEntry]));
-                       w57.Position = 0;
+                       global::Gtk.Box.BoxChild w60 = ((global::Gtk.Box.BoxChild)(this.outputfilehbox1 
[this.outfileEntry]));
+                       w60.Position = 0;
                        // Container child outputfilehbox1.Gtk.Box+BoxChild
                        this.savebutton = new global::Gtk.Button ();
                        this.savebutton.CanFocus = true;
                        this.savebutton.Name = "savebutton";
                        this.savebutton.UseUnderline = true;
                        // Container child savebutton.Gtk.Container+ContainerChild
-                       global::Gtk.Alignment w58 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
+                       global::Gtk.Alignment w61 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
                        // Container child GtkAlignment.Gtk.Container+ContainerChild
-                       global::Gtk.HBox w59 = new global::Gtk.HBox ();
-                       w59.Spacing = 2;
+                       global::Gtk.HBox w62 = new global::Gtk.HBox ();
+                       w62.Spacing = 2;
                        // Container child GtkHBox.Gtk.Container+ContainerChild
-                       global::Gtk.Image w60 = new global::Gtk.Image ();
-                       w60.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-save-as", 
global::Gtk.IconSize.Menu);
-                       w59.Add (w60);
+                       global::Gtk.Image w63 = new global::Gtk.Image ();
+                       w63.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-save-as", 
global::Gtk.IconSize.Menu);
+                       w62.Add (w63);
                        // Container child GtkHBox.Gtk.Container+ContainerChild
-                       global::Gtk.Label w62 = new global::Gtk.Label ();
-                       w59.Add (w62);
-                       w58.Add (w59);
-                       this.savebutton.Add (w58);
+                       global::Gtk.Label w65 = new global::Gtk.Label ();
+                       w62.Add (w65);
+                       w61.Add (w62);
+                       this.savebutton.Add (w61);
                        this.outputfilehbox1.Add (this.savebutton);
-                       global::Gtk.Box.BoxChild w66 = ((global::Gtk.Box.BoxChild)(this.outputfilehbox1 
[this.savebutton]));
-                       w66.Position = 1;
-                       w66.Expand = false;
+                       global::Gtk.Box.BoxChild w69 = ((global::Gtk.Box.BoxChild)(this.outputfilehbox1 
[this.savebutton]));
+                       w69.Position = 1;
+                       w69.Expand = false;
                        this.outputfiletable.Add (this.outputfilehbox1);
-                       global::Gtk.Table.TableChild w67 = 
((global::Gtk.Table.TableChild)(this.outputfiletable [this.outputfilehbox1]));
-                       w67.LeftAttach = ((uint)(1));
-                       w67.RightAttach = ((uint)(2));
-                       w67.YOptions = ((global::Gtk.AttachOptions)(0));
+                       global::Gtk.Table.TableChild w70 = 
((global::Gtk.Table.TableChild)(this.outputfiletable [this.outputfilehbox1]));
+                       w70.LeftAttach = ((uint)(1));
+                       w70.RightAttach = ((uint)(2));
+                       w70.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child outputfiletable.Gtk.Table+TableChild
                        this.outputfilelabel = new global::Gtk.Label ();
                        this.outputfilelabel.Name = "outputfilelabel";
                        this.outputfilelabel.LabelProp = global::Mono.Unix.Catalog.GetString ("Output file:");
                        this.outputfiletable.Add (this.outputfilelabel);
-                       global::Gtk.Table.TableChild w68 = 
((global::Gtk.Table.TableChild)(this.outputfiletable [this.outputfilelabel]));
-                       w68.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w68.YOptions = ((global::Gtk.AttachOptions)(4));
-                       this.vbox4.Add (this.outputfiletable);
-                       global::Gtk.Box.BoxChild w69 = ((global::Gtk.Box.BoxChild)(this.vbox4 
[this.outputfiletable]));
-                       w69.Position = 5;
-                       w69.Expand = false;
-                       w69.Fill = false;
-                       // Container child vbox4.Gtk.Box+BoxChild
+                       global::Gtk.Table.TableChild w71 = 
((global::Gtk.Table.TableChild)(this.outputfiletable [this.outputfilelabel]));
+                       w71.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w71.YOptions = ((global::Gtk.AttachOptions)(4));
+                       this.centerbox.Add (this.outputfiletable);
+                       global::Gtk.Box.BoxChild w72 = ((global::Gtk.Box.BoxChild)(this.centerbox 
[this.outputfiletable]));
+                       w72.Position = 3;
+                       w72.Expand = false;
+                       w72.Fill = false;
+                       // Container child centerbox.Gtk.Box+BoxChild
                        this.capturetable = new global::Gtk.Table (((uint)(2)), ((uint)(4)), true);
                        this.capturetable.Name = "capturetable";
                        this.capturetable.RowSpacing = ((uint)(6));
@@ -583,11 +538,11 @@ namespace LongoMatch.Gui.Panel
                        this.encodingcombobox = global::Gtk.ComboBox.NewText ();
                        this.encodingcombobox.Name = "encodingcombobox";
                        this.capturetable.Add (this.encodingcombobox);
-                       global::Gtk.Table.TableChild w70 = ((global::Gtk.Table.TableChild)(this.capturetable 
[this.encodingcombobox]));
-                       w70.LeftAttach = ((uint)(3));
-                       w70.RightAttach = ((uint)(4));
-                       w70.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w70.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w73 = ((global::Gtk.Table.TableChild)(this.capturetable 
[this.encodingcombobox]));
+                       w73.LeftAttach = ((uint)(3));
+                       w73.RightAttach = ((uint)(4));
+                       w73.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w73.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child capturetable.Gtk.Table+TableChild
                        this.hbox6 = new global::Gtk.HBox ();
                        this.hbox6.Name = "hbox6";
@@ -597,19 +552,19 @@ namespace LongoMatch.Gui.Panel
                        this.device.Name = "device";
                        this.device.LabelProp = global::Mono.Unix.Catalog.GetString ("Device:");
                        this.hbox6.Add (this.device);
-                       global::Gtk.Box.BoxChild w71 = ((global::Gtk.Box.BoxChild)(this.hbox6 [this.device]));
-                       w71.Position = 0;
+                       global::Gtk.Box.BoxChild w74 = ((global::Gtk.Box.BoxChild)(this.hbox6 [this.device]));
+                       w74.Position = 0;
                        // Container child hbox6.Gtk.Box+BoxChild
                        this.urilabel = new global::Gtk.Label ();
                        this.urilabel.Name = "urilabel";
                        this.urilabel.LabelProp = global::Mono.Unix.Catalog.GetString ("URL:");
                        this.hbox6.Add (this.urilabel);
-                       global::Gtk.Box.BoxChild w72 = ((global::Gtk.Box.BoxChild)(this.hbox6 
[this.urilabel]));
-                       w72.Position = 1;
+                       global::Gtk.Box.BoxChild w75 = ((global::Gtk.Box.BoxChild)(this.hbox6 
[this.urilabel]));
+                       w75.Position = 1;
                        this.capturetable.Add (this.hbox6);
-                       global::Gtk.Table.TableChild w73 = ((global::Gtk.Table.TableChild)(this.capturetable 
[this.hbox6]));
-                       w73.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w73.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w76 = ((global::Gtk.Table.TableChild)(this.capturetable 
[this.hbox6]));
+                       w76.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w76.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child capturetable.Gtk.Table+TableChild
                        this.hbox7 = new global::Gtk.HBox ();
                        this.hbox7.Name = "hbox7";
@@ -618,8 +573,8 @@ namespace LongoMatch.Gui.Panel
                        this.devicecombobox = global::Gtk.ComboBox.NewText ();
                        this.devicecombobox.Name = "devicecombobox";
                        this.hbox7.Add (this.devicecombobox);
-                       global::Gtk.Box.BoxChild w74 = ((global::Gtk.Box.BoxChild)(this.hbox7 
[this.devicecombobox]));
-                       w74.Position = 0;
+                       global::Gtk.Box.BoxChild w77 = ((global::Gtk.Box.BoxChild)(this.hbox7 
[this.devicecombobox]));
+                       w77.Position = 0;
                        // Container child hbox7.Gtk.Box+BoxChild
                        this.urientry = new global::Gtk.Entry ();
                        this.urientry.CanFocus = true;
@@ -627,293 +582,159 @@ namespace LongoMatch.Gui.Panel
                        this.urientry.IsEditable = true;
                        this.urientry.InvisibleChar = '•';
                        this.hbox7.Add (this.urientry);
-                       global::Gtk.Box.BoxChild w75 = ((global::Gtk.Box.BoxChild)(this.hbox7 
[this.urientry]));
-                       w75.Position = 1;
+                       global::Gtk.Box.BoxChild w78 = ((global::Gtk.Box.BoxChild)(this.hbox7 
[this.urientry]));
+                       w78.Position = 1;
                        this.capturetable.Add (this.hbox7);
-                       global::Gtk.Table.TableChild w76 = ((global::Gtk.Table.TableChild)(this.capturetable 
[this.hbox7]));
-                       w76.LeftAttach = ((uint)(1));
-                       w76.RightAttach = ((uint)(2));
-                       w76.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w76.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w79 = ((global::Gtk.Table.TableChild)(this.capturetable 
[this.hbox7]));
+                       w79.LeftAttach = ((uint)(1));
+                       w79.RightAttach = ((uint)(2));
+                       w79.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w79.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child capturetable.Gtk.Table+TableChild
                        this.imagecombobox = global::Gtk.ComboBox.NewText ();
                        this.imagecombobox.Name = "imagecombobox";
                        this.capturetable.Add (this.imagecombobox);
-                       global::Gtk.Table.TableChild w77 = ((global::Gtk.Table.TableChild)(this.capturetable 
[this.imagecombobox]));
-                       w77.TopAttach = ((uint)(1));
-                       w77.BottomAttach = ((uint)(2));
-                       w77.LeftAttach = ((uint)(1));
-                       w77.RightAttach = ((uint)(2));
-                       w77.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w77.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w80 = ((global::Gtk.Table.TableChild)(this.capturetable 
[this.imagecombobox]));
+                       w80.TopAttach = ((uint)(1));
+                       w80.BottomAttach = ((uint)(2));
+                       w80.LeftAttach = ((uint)(1));
+                       w80.RightAttach = ((uint)(2));
+                       w80.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w80.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child capturetable.Gtk.Table+TableChild
                        this.qualitycombobox = global::Gtk.ComboBox.NewText ();
                        this.qualitycombobox.Name = "qualitycombobox";
                        this.capturetable.Add (this.qualitycombobox);
-                       global::Gtk.Table.TableChild w78 = ((global::Gtk.Table.TableChild)(this.capturetable 
[this.qualitycombobox]));
-                       w78.TopAttach = ((uint)(1));
-                       w78.BottomAttach = ((uint)(2));
-                       w78.LeftAttach = ((uint)(3));
-                       w78.RightAttach = ((uint)(4));
-                       w78.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w78.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w81 = ((global::Gtk.Table.TableChild)(this.capturetable 
[this.qualitycombobox]));
+                       w81.TopAttach = ((uint)(1));
+                       w81.BottomAttach = ((uint)(2));
+                       w81.LeftAttach = ((uint)(3));
+                       w81.RightAttach = ((uint)(4));
+                       w81.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w81.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child capturetable.Gtk.Table+TableChild
                        this.qualitylabel = new global::Gtk.Label ();
                        this.qualitylabel.Name = "qualitylabel";
                        this.qualitylabel.LabelProp = global::Mono.Unix.Catalog.GetString ("Quality:");
                        this.capturetable.Add (this.qualitylabel);
-                       global::Gtk.Table.TableChild w79 = ((global::Gtk.Table.TableChild)(this.capturetable 
[this.qualitylabel]));
-                       w79.TopAttach = ((uint)(1));
-                       w79.BottomAttach = ((uint)(2));
-                       w79.LeftAttach = ((uint)(2));
-                       w79.RightAttach = ((uint)(3));
-                       w79.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w79.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w82 = ((global::Gtk.Table.TableChild)(this.capturetable 
[this.qualitylabel]));
+                       w82.TopAttach = ((uint)(1));
+                       w82.BottomAttach = ((uint)(2));
+                       w82.LeftAttach = ((uint)(2));
+                       w82.RightAttach = ((uint)(3));
+                       w82.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w82.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child capturetable.Gtk.Table+TableChild
                        this.sizelabel = new global::Gtk.Label ();
                        this.sizelabel.Name = "sizelabel";
                        this.sizelabel.LabelProp = global::Mono.Unix.Catalog.GetString ("Image format:");
                        this.capturetable.Add (this.sizelabel);
-                       global::Gtk.Table.TableChild w80 = ((global::Gtk.Table.TableChild)(this.capturetable 
[this.sizelabel]));
-                       w80.TopAttach = ((uint)(1));
-                       w80.BottomAttach = ((uint)(2));
-                       w80.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w83 = ((global::Gtk.Table.TableChild)(this.capturetable 
[this.sizelabel]));
+                       w83.TopAttach = ((uint)(1));
+                       w83.BottomAttach = ((uint)(2));
+                       w83.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child capturetable.Gtk.Table+TableChild
                        this.videoformatlabel = new global::Gtk.Label ();
                        this.videoformatlabel.Name = "videoformatlabel";
                        this.videoformatlabel.LabelProp = global::Mono.Unix.Catalog.GetString ("Encoding 
format:");
                        this.capturetable.Add (this.videoformatlabel);
-                       global::Gtk.Table.TableChild w81 = ((global::Gtk.Table.TableChild)(this.capturetable 
[this.videoformatlabel]));
-                       w81.LeftAttach = ((uint)(2));
-                       w81.RightAttach = ((uint)(3));
-                       w81.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w81.YOptions = ((global::Gtk.AttachOptions)(4));
-                       this.vbox4.Add (this.capturetable);
-                       global::Gtk.Box.BoxChild w82 = ((global::Gtk.Box.BoxChild)(this.vbox4 
[this.capturetable]));
-                       w82.Position = 6;
-                       w82.Expand = false;
-                       w82.Fill = false;
-                       // Container child vbox4.Gtk.Box+BoxChild
-                       this.vbox5 = new global::Gtk.VBox ();
-                       this.vbox5.Name = "vbox5";
-                       this.vbox5.Spacing = 6;
-                       // Container child vbox5.Gtk.Box+BoxChild
-                       this.hbox10 = new global::Gtk.HBox ();
-                       this.hbox10.Name = "hbox10";
-                       this.hbox10.Spacing = 6;
-                       // Container child hbox10.Gtk.Box+BoxChild
-                       this.homeshieldimage = new global::Gtk.Image ();
-                       this.homeshieldimage.Name = "homeshieldimage";
-                       this.hbox10.Add (this.homeshieldimage);
-                       global::Gtk.Box.BoxChild w83 = ((global::Gtk.Box.BoxChild)(this.hbox10 
[this.homeshieldimage]));
-                       w83.Position = 0;
-                       w83.Expand = false;
-                       w83.Fill = false;
-                       // Container child hbox10.Gtk.Box+BoxChild
-                       this.homelabel = new global::Gtk.Label ();
-                       this.homelabel.Name = "homelabel";
-                       this.hbox10.Add (this.homelabel);
-                       global::Gtk.Box.BoxChild w84 = ((global::Gtk.Box.BoxChild)(this.hbox10 
[this.homelabel]));
-                       w84.Position = 1;
-                       w84.Expand = false;
-                       w84.Fill = false;
-                       // Container child hbox10.Gtk.Box+BoxChild
-                       this.hometeamscombobox = global::Gtk.ComboBox.NewText ();
-                       this.hometeamscombobox.Name = "hometeamscombobox";
-                       this.hbox10.Add (this.hometeamscombobox);
-                       global::Gtk.Box.BoxChild w85 = ((global::Gtk.Box.BoxChild)(this.hbox10 
[this.hometeamscombobox]));
-                       w85.Position = 2;
+                       global::Gtk.Table.TableChild w84 = ((global::Gtk.Table.TableChild)(this.capturetable 
[this.videoformatlabel]));
+                       w84.LeftAttach = ((uint)(2));
+                       w84.RightAttach = ((uint)(3));
+                       w84.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w84.YOptions = ((global::Gtk.AttachOptions)(4));
+                       this.centerbox.Add (this.capturetable);
+                       global::Gtk.Box.BoxChild w85 = ((global::Gtk.Box.BoxChild)(this.centerbox 
[this.capturetable]));
+                       w85.Position = 4;
+                       w85.Expand = false;
                        w85.Fill = false;
-                       // Container child hbox10.Gtk.Box+BoxChild
-                       this.awayteamscombobox = global::Gtk.ComboBox.NewText ();
-                       this.awayteamscombobox.Name = "awayteamscombobox";
-                       this.hbox10.Add (this.awayteamscombobox);
-                       global::Gtk.Box.BoxChild w86 = ((global::Gtk.Box.BoxChild)(this.hbox10 
[this.awayteamscombobox]));
-                       w86.Position = 3;
+                       this.topbox.Add (this.centerbox);
+                       global::Gtk.Box.BoxChild w86 = ((global::Gtk.Box.BoxChild)(this.topbox 
[this.centerbox]));
+                       w86.Position = 1;
                        w86.Fill = false;
-                       // Container child hbox10.Gtk.Box+BoxChild
-                       this.awaylabel = new global::Gtk.Label ();
-                       this.awaylabel.Name = "awaylabel";
-                       this.hbox10.Add (this.awaylabel);
-                       global::Gtk.Box.BoxChild w87 = ((global::Gtk.Box.BoxChild)(this.hbox10 
[this.awaylabel]));
-                       w87.Position = 4;
-                       w87.Expand = false;
-                       w87.Fill = false;
-                       // Container child hbox10.Gtk.Box+BoxChild
-                       this.awayshieldimage = new global::Gtk.Image ();
-                       this.awayshieldimage.Name = "awayshieldimage";
-                       this.hbox10.Add (this.awayshieldimage);
-                       global::Gtk.Box.BoxChild w88 = ((global::Gtk.Box.BoxChild)(this.hbox10 
[this.awayshieldimage]));
-                       w88.Position = 5;
-                       w88.Expand = false;
-                       w88.Fill = false;
-                       this.vbox5.Add (this.hbox10);
-                       global::Gtk.Box.BoxChild w89 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox10]));
-                       w89.Position = 0;
+                       // Container child topbox.Gtk.Box+BoxChild
+                       this.righttable = new global::Gtk.Table (((uint)(3)), ((uint)(2)), true);
+                       this.righttable.Name = "righttable";
+                       this.righttable.RowSpacing = ((uint)(6));
+                       this.righttable.ColumnSpacing = ((uint)(6));
+                       // Container child righttable.Gtk.Table+TableChild
+                       this.analysislabel = new global::Gtk.Label ();
+                       this.analysislabel.Name = "analysislabel";
+                       this.analysislabel.LabelProp = global::Mono.Unix.Catalog.GetString ("Analisys 
Template:");
+                       this.righttable.Add (this.analysislabel);
+                       global::Gtk.Table.TableChild w87 = ((global::Gtk.Table.TableChild)(this.righttable 
[this.analysislabel]));
+                       w87.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w87.YOptions = ((global::Gtk.AttachOptions)(4));
+                       // Container child righttable.Gtk.Table+TableChild
+                       this.tagscombobox = global::Gtk.ComboBox.NewText ();
+                       this.tagscombobox.Name = "tagscombobox";
+                       this.righttable.Add (this.tagscombobox);
+                       global::Gtk.Table.TableChild w88 = ((global::Gtk.Table.TableChild)(this.righttable 
[this.tagscombobox]));
+                       w88.LeftAttach = ((uint)(1));
+                       w88.RightAttach = ((uint)(2));
+                       w88.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w88.YOptions = ((global::Gtk.AttachOptions)(0));
+                       this.topbox.Add (this.righttable);
+                       global::Gtk.Box.BoxChild w89 = ((global::Gtk.Box.BoxChild)(this.topbox 
[this.righttable]));
+                       w89.Position = 2;
                        w89.Expand = false;
                        w89.Fill = false;
+                       this.alignment1.Add (this.topbox);
+                       this.vbox5.Add (this.alignment1);
+                       global::Gtk.Box.BoxChild w91 = ((global::Gtk.Box.BoxChild)(this.vbox5 
[this.alignment1]));
+                       w91.Position = 0;
+                       w91.Expand = false;
+                       w91.Fill = false;
                        // Container child vbox5.Gtk.Box+BoxChild
-                       this.drawingarea1 = new global::Gtk.DrawingArea ();
-                       this.drawingarea1.Name = "drawingarea1";
-                       this.vbox5.Add (this.drawingarea1);
-                       global::Gtk.Box.BoxChild w90 = ((global::Gtk.Box.BoxChild)(this.vbox5 
[this.drawingarea1]));
-                       w90.Position = 1;
-                       this.vbox4.Add (this.vbox5);
-                       global::Gtk.Box.BoxChild w91 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.vbox5]));
-                       w91.Position = 7;
-                       this.notebook1.Add (this.vbox4);
-                       global::Gtk.Notebook.NotebookChild w92 = 
((global::Gtk.Notebook.NotebookChild)(this.notebook1 [this.vbox4]));
-                       w92.Position = 1;
-                       w92.TabFill = false;
-                       w92.MenuLabel = "";
+                       this.vbox6 = new global::Gtk.VBox ();
+                       this.vbox6.Name = "vbox6";
+                       this.vbox6.Spacing = 6;
+                       // Container child vbox6.Gtk.Box+BoxChild
+                       this.drawingarea = new global::Gtk.DrawingArea ();
+                       this.drawingarea.Name = "drawingarea";
+                       this.vbox6.Add (this.drawingarea);
+                       global::Gtk.Box.BoxChild w92 = ((global::Gtk.Box.BoxChild)(this.vbox6 
[this.drawingarea]));
+                       w92.Position = 0;
+                       this.vbox5.Add (this.vbox6);
+                       global::Gtk.Box.BoxChild w93 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.vbox6]));
+                       w93.Position = 1;
+                       this.notebook1.Add (this.vbox5);
+                       global::Gtk.Notebook.NotebookChild w94 = 
((global::Gtk.Notebook.NotebookChild)(this.notebook1 [this.vbox5]));
+                       w94.Position = 1;
+                       w94.TabFill = false;
+                       w94.MenuLabel = "";
                        // Notebook tab
                        this.label3 = new global::Gtk.Label ();
                        this.label3.Name = "label3";
                        this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("page2");
-                       this.notebook1.SetTabLabel (this.vbox4, this.label3);
+                       this.notebook1.SetTabLabel (this.vbox5, this.label3);
                        this.label3.ShowAll ();
                        // Container child notebook1.Gtk.Notebook+NotebookChild
-                       this.vbox6 = new global::Gtk.VBox ();
-                       this.vbox6.Name = "vbox6";
-                       this.vbox6.Spacing = 6;
-                       // Container child vbox6.Gtk.Box+BoxChild
-                       this.label8 = new global::Gtk.Label ();
-                       this.label8.Name = "label8";
-                       this.label8.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Video 
synchronization</b>");
-                       this.label8.UseMarkup = true;
-                       this.vbox6.Add (this.label8);
-                       global::Gtk.Box.BoxChild w93 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.label8]));
-                       w93.Position = 0;
-                       w93.Expand = false;
-                       w93.Fill = false;
-                       w93.Padding = ((uint)(30));
-                       // Container child vbox6.Gtk.Box+BoxChild
-                       this.hseparator4 = new global::Gtk.HSeparator ();
-                       this.hseparator4.Name = "hseparator4";
-                       this.vbox6.Add (this.hseparator4);
-                       global::Gtk.Box.BoxChild w94 = ((global::Gtk.Box.BoxChild)(this.vbox6 
[this.hseparator4]));
-                       w94.Position = 1;
-                       w94.Expand = false;
-                       w94.Fill = false;
-                       // Container child vbox6.Gtk.Box+BoxChild
                        this.projectperiods1 = new global::LongoMatch.Gui.Component.ProjectPeriods ();
                        this.projectperiods1.Events = ((global::Gdk.EventMask)(256));
                        this.projectperiods1.Name = "projectperiods1";
-                       this.vbox6.Add (this.projectperiods1);
-                       global::Gtk.Box.BoxChild w95 = ((global::Gtk.Box.BoxChild)(this.vbox6 
[this.projectperiods1]));
+                       this.notebook1.Add (this.projectperiods1);
+                       global::Gtk.Notebook.NotebookChild w95 = 
((global::Gtk.Notebook.NotebookChild)(this.notebook1 [this.projectperiods1]));
                        w95.Position = 2;
-                       this.notebook1.Add (this.vbox6);
-                       global::Gtk.Notebook.NotebookChild w96 = 
((global::Gtk.Notebook.NotebookChild)(this.notebook1 [this.vbox6]));
-                       w96.Position = 2;
                        // Notebook tab
                        this.label7 = new global::Gtk.Label ();
                        this.label7.Name = "label7";
                        this.label7.LabelProp = global::Mono.Unix.Catalog.GetString ("page3");
-                       this.notebook1.SetTabLabel (this.vbox6, this.label7);
+                       this.notebook1.SetTabLabel (this.projectperiods1, this.label7);
                        this.label7.ShowAll ();
-                       this.hbox3.Add (this.notebook1);
-                       global::Gtk.Box.BoxChild w97 = ((global::Gtk.Box.BoxChild)(this.hbox3 
[this.notebook1]));
-                       w97.Position = 1;
-                       this.vbox2.Add (this.hbox3);
-                       global::Gtk.Box.BoxChild w98 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox3]));
-                       w98.Position = 0;
-                       // Container child vbox2.Gtk.Box+BoxChild
-                       this.hbuttonbox2 = new global::Gtk.HButtonBox ();
-                       this.hbuttonbox2.Name = "hbuttonbox2";
-                       this.hbuttonbox2.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(1));
-                       // Container child hbuttonbox2.Gtk.ButtonBox+ButtonBoxChild
-                       this.backbutton = new global::Gtk.Button ();
-                       this.backbutton.CanFocus = true;
-                       this.backbutton.Name = "backbutton";
-                       this.backbutton.UseUnderline = true;
-                       // Container child backbutton.Gtk.Container+ContainerChild
-                       global::Gtk.Alignment w99 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
-                       // Container child GtkAlignment.Gtk.Container+ContainerChild
-                       global::Gtk.HBox w100 = new global::Gtk.HBox ();
-                       w100.Spacing = 2;
-                       // Container child GtkHBox.Gtk.Container+ContainerChild
-                       global::Gtk.Image w101 = new global::Gtk.Image ();
-                       w101.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-go-back", 
global::Gtk.IconSize.Dialog);
-                       w100.Add (w101);
-                       // Container child GtkHBox.Gtk.Container+ContainerChild
-                       global::Gtk.Label w103 = new global::Gtk.Label ();
-                       w103.LabelProp = global::Mono.Unix.Catalog.GetString ("_Back");
-                       w103.UseUnderline = true;
-                       w100.Add (w103);
-                       w99.Add (w100);
-                       this.backbutton.Add (w99);
-                       this.hbuttonbox2.Add (this.backbutton);
-                       global::Gtk.ButtonBox.ButtonBoxChild w107 = 
((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox2 [this.backbutton]));
-                       w107.Expand = false;
-                       w107.Fill = false;
-                       // Container child hbuttonbox2.Gtk.ButtonBox+ButtonBoxChild
-                       this.nextbutton = new global::Gtk.Button ();
-                       this.nextbutton.CanFocus = true;
-                       this.nextbutton.Name = "nextbutton";
-                       this.nextbutton.UseUnderline = true;
-                       // Container child nextbutton.Gtk.Container+ContainerChild
-                       global::Gtk.Alignment w108 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
-                       // Container child GtkAlignment.Gtk.Container+ContainerChild
-                       global::Gtk.HBox w109 = new global::Gtk.HBox ();
-                       w109.Spacing = 2;
-                       // Container child GtkHBox.Gtk.Container+ContainerChild
-                       global::Gtk.Image w110 = new global::Gtk.Image ();
-                       w110.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-go-forward", 
global::Gtk.IconSize.Dialog);
-                       w109.Add (w110);
-                       // Container child GtkHBox.Gtk.Container+ContainerChild
-                       global::Gtk.Label w112 = new global::Gtk.Label ();
-                       w112.LabelProp = global::Mono.Unix.Catalog.GetString ("_Next");
-                       w112.UseUnderline = true;
-                       w109.Add (w112);
-                       w108.Add (w109);
-                       this.nextbutton.Add (w108);
-                       this.hbuttonbox2.Add (this.nextbutton);
-                       global::Gtk.ButtonBox.ButtonBoxChild w116 = 
((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox2 [this.nextbutton]));
-                       w116.Position = 1;
-                       w116.Expand = false;
-                       w116.Fill = false;
-                       // Container child hbuttonbox2.Gtk.ButtonBox+ButtonBoxChild
-                       this.createbutton = new global::Gtk.Button ();
-                       this.createbutton.CanFocus = true;
-                       this.createbutton.Name = "createbutton";
-                       this.createbutton.UseUnderline = true;
-                       // Container child createbutton.Gtk.Container+ContainerChild
-                       global::Gtk.Alignment w117 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
-                       // Container child GtkAlignment.Gtk.Container+ContainerChild
-                       global::Gtk.HBox w118 = new global::Gtk.HBox ();
-                       w118.Spacing = 2;
-                       // Container child GtkHBox.Gtk.Container+ContainerChild
-                       global::Gtk.Image w119 = new global::Gtk.Image ();
-                       w119.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-new", 
global::Gtk.IconSize.Dialog);
-                       w118.Add (w119);
-                       // Container child GtkHBox.Gtk.Container+ContainerChild
-                       global::Gtk.Label w121 = new global::Gtk.Label ();
-                       w121.LabelProp = global::Mono.Unix.Catalog.GetString ("Create project");
-                       w121.UseUnderline = true;
-                       w118.Add (w121);
-                       w117.Add (w118);
-                       this.createbutton.Add (w117);
-                       this.hbuttonbox2.Add (this.createbutton);
-                       global::Gtk.ButtonBox.ButtonBoxChild w125 = 
((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox2 [this.createbutton]));
-                       w125.Position = 2;
-                       w125.Expand = false;
-                       w125.Fill = false;
-                       this.vbox2.Add (this.hbuttonbox2);
-                       global::Gtk.Box.BoxChild w126 = ((global::Gtk.Box.BoxChild)(this.vbox2 
[this.hbuttonbox2]));
-                       w126.Position = 1;
-                       w126.Expand = false;
-                       this.Add (this.vbox2);
+                       this.vbox3.Add (this.notebook1);
+                       global::Gtk.Box.BoxChild w96 = ((global::Gtk.Box.BoxChild)(this.vbox3 
[this.notebook1]));
+                       w96.Position = 1;
+                       this.Add (this.vbox3);
                        if ((this.Child != null)) {
                                this.Child.ShowAll ();
                        }
-                       this.filetable.Hide ();
-                       this.outputfiletable.Hide ();
+                       this.createbutton.Hide ();
                        this.device.Hide ();
                        this.urilabel.Hide ();
                        this.devicecombobox.Hide ();
                        this.urientry.Hide ();
                        this.capturetable.Hide ();
-                       this.createbutton.Hide ();
                        this.Hide ();
                }
        }
diff --git a/LongoMatch.GUI/gtk-gui/gui.stetic b/LongoMatch.GUI/gtk-gui/gui.stetic
index 1a75c08..b070535 100644
--- a/LongoMatch.GUI/gtk-gui/gui.stetic
+++ b/LongoMatch.GUI/gtk-gui/gui.stetic
@@ -732,7 +732,7 @@
             <property name="MemberName" />
             <property name="Spacing">6</property>
             <child>
-              <widget class="LongoMatch.Gui.Panel.WelcomePanel" id="welcomepanel1">
+              <widget class="LongoMatch.Gui.Panel.WelcomePanel" id="welcomepanel">
                 <property name="MemberName" />
                 <property name="Events">ButtonPressMask</property>
               </widget>
@@ -6149,7 +6149,7 @@ You can continue with the current capture, cancel it or save your project.
       </widget>
     </child>
   </widget>
-  <widget class="Gtk.Bin" id="LongoMatch.Gui.Panel.WelcomePanel" design-size="861 345">
+  <widget class="Gtk.Bin" id="LongoMatch.Gui.Panel.WelcomePanel" design-size="910 620">
     <property name="MemberName" />
     <property name="Visible">False</property>
     <child>
@@ -6273,1053 +6273,923 @@ You can continue with the current capture, cancel it or save your project.
       </widget>
     </child>
   </widget>
-  <widget class="Gtk.Bin" id="LongoMatch.Gui.Panel.NewProjectPanel" design-size="840 647">
+  <widget class="Gtk.Bin" id="LongoMatch.Gui.Panel.NewProjectPanel" design-size="1182 340">
     <property name="MemberName" />
     <property name="Visible">False</property>
     <child>
-      <widget class="Gtk.VBox" id="vbox2">
+      <widget class="Gtk.VBox" id="vbox3">
         <property name="MemberName" />
-        <property name="Spacing">6</property>
         <child>
-          <widget class="Gtk.HBox" id="hbox3">
+          <widget class="Gtk.HBox" id="newheaderbox">
             <property name="MemberName" />
             <property name="Spacing">6</property>
             <child>
-              <widget class="LongoMatch.Gui.Component.BackgroundWidget" id="backgroundwidget">
+              <widget class="Gtk.Image" id="logoimage">
                 <property name="MemberName" />
-                <property name="Events">ButtonPressMask</property>
               </widget>
               <packing>
                 <property name="Position">0</property>
+                <property name="AutoSize">True</property>
+                <property name="Expand">False</property>
+                <property name="Fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="Gtk.Label" id="titlelabel">
+                <property name="MemberName" />
+                <property name="Xalign">0</property>
+                <property name="LabelProp" translatable="yes">&lt;b&gt;PROJECT 
PROPERTIES&lt;/b&gt;</property>
+                <property name="UseMarkup">True</property>
+                <property name="Justify">Center</property>
+              </widget>
+              <packing>
+                <property name="Position">1</property>
                 <property name="AutoSize">False</property>
                 <property name="Expand">False</property>
               </packing>
             </child>
             <child>
-              <widget class="Gtk.Notebook" id="notebook1">
+              <widget class="Gtk.Button" id="createbutton">
                 <property name="MemberName" />
+                <property name="Visible">False</property>
                 <property name="CanFocus">True</property>
-                <property name="CurrentPage">2</property>
-                <property name="ShowBorder">False</property>
-                <property name="Scrollable">True</property>
+                <property name="Type">TextAndIcon</property>
+                <property name="Icon">stock:gtk-new Dialog</property>
+                <property name="Label" translatable="yes">Create project</property>
+                <property name="UseUnderline">True</property>
+              </widget>
+              <packing>
+                <property name="PackType">End</property>
+                <property name="Position">2</property>
+                <property name="AutoSize">True</property>
+                <property name="Expand">False</property>
+                <property name="Fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="Gtk.Button" id="nextroundedbutton">
+                <property name="MemberName" />
+                <property name="CanFocus">True</property>
+                <property name="Type">TextAndIcon</property>
+                <property name="Icon">stock:longomatch-apply Dialog</property>
+                <property name="Label" translatable="yes" />
+                <property name="UseUnderline">True</property>
+              </widget>
+              <packing>
+                <property name="PackType">End</property>
+                <property name="Position">3</property>
+                <property name="AutoSize">False</property>
+                <property name="Expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="Gtk.Button" id="backrectbutton">
+                <property name="MemberName" />
+                <property name="WidthRequest">80</property>
+                <property name="HeightRequest">40</property>
+                <property name="CanFocus">True</property>
+                <property name="Type">TextAndIcon</property>
+                <property name="Icon">stock:longomatch-back Dialog</property>
+                <property name="Label" translatable="yes" />
+                <property name="UseUnderline">True</property>
+                <property name="BorderWidth">10</property>
+              </widget>
+              <packing>
+                <property name="PackType">End</property>
+                <property name="Position">4</property>
+                <property name="AutoSize">False</property>
+                <property name="Expand">False</property>
+                <property name="Fill">False</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="Position">0</property>
+            <property name="AutoSize">True</property>
+            <property name="Expand">False</property>
+            <property name="Fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="Gtk.Notebook" id="notebook1">
+            <property name="MemberName" />
+            <property name="CanFocus">True</property>
+            <property name="CurrentPage">1</property>
+            <property name="ShowBorder">False</property>
+            <property name="Scrollable">True</property>
+            <child>
+              <widget class="Gtk.VBox" id="vbox4">
+                <property name="MemberName" />
+                <property name="Spacing">6</property>
                 <child>
-                  <widget class="Gtk.VBox" id="vbox3">
+                  <widget class="Gtk.HSeparator" id="hseparator1">
+                    <property name="MemberName" />
+                  </widget>
+                  <packing>
+                    <property name="Position">0</property>
+                    <property name="AutoSize">True</property>
+                    <property name="Expand">False</property>
+                    <property name="Fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="Gtk.HBox" id="hbox20">
                     <property name="MemberName" />
                     <property name="Spacing">6</property>
                     <child>
-                      <widget class="Gtk.Label" id="label6">
+                      <widget class="Gtk.RadioButton" id="fromfileradiobutton">
                         <property name="MemberName" />
-                        <property name="LabelProp" translatable="yes">&lt;b&gt;Select new project 
type&lt;/b&gt;</property>
-                        <property name="UseMarkup">True</property>
-                        <property name="Justify">Center</property>
+                        <property name="CanFocus">True</property>
+                        <property name="Label" translatable="yes">New project using a video file</property>
+                        <property name="DrawIndicator">True</property>
+                        <property name="HasLabel">True</property>
+                        <property name="UseUnderline">True</property>
+                        <property name="FocusOnClick">False</property>
+                        <property name="Group">project</property>
                       </widget>
                       <packing>
                         <property name="Position">0</property>
                         <property name="AutoSize">False</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                        <property name="Padding">30</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="Gtk.HSeparator" id="hseparator1">
+                      <widget class="Gtk.Image" id="image61">
                         <property name="MemberName" />
+                        <property name="Pixbuf">resource:video.png</property>
                       </widget>
                       <packing>
                         <property name="Position">1</property>
-                        <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
+                        <property name="AutoSize">False</property>
                       </packing>
                     </child>
+                  </widget>
+                  <packing>
+                    <property name="Position">1</property>
+                    <property name="AutoSize">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="Gtk.HBox" id="hbox2">
+                    <property name="MemberName" />
+                    <property name="Spacing">6</property>
                     <child>
-                      <widget class="Gtk.HBox" id="hbox1">
+                      <widget class="Gtk.RadioButton" id="liveradiobutton">
                         <property name="MemberName" />
-                        <property name="Spacing">6</property>
-                        <child>
-                          <widget class="Gtk.RadioButton" id="fromfileradiobutton">
-                            <property name="MemberName" />
-                            <property name="CanFocus">True</property>
-                            <property name="Label" translatable="yes">New project using a video 
file</property>
-                            <property name="Active">True</property>
-                            <property name="DrawIndicator">True</property>
-                            <property name="HasLabel">True</property>
-                            <property name="UseUnderline">True</property>
-                            <property name="FocusOnClick">False</property>
-                            <property name="Group">project</property>
-                          </widget>
-                          <packing>
-                            <property name="Position">0</property>
-                            <property name="AutoSize">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="Gtk.Image" id="image61">
-                            <property name="MemberName" />
-                            <property name="Pixbuf">resource:video.png</property>
-                          </widget>
-                          <packing>
-                            <property name="Position">1</property>
-                            <property name="AutoSize">False</property>
-                          </packing>
-                        </child>
+                        <property name="CanFocus">True</property>
+                        <property name="Label" translatable="yes">Live project using a capture 
device</property>
+                        <property name="DrawIndicator">True</property>
+                        <property name="HasLabel">True</property>
+                        <property name="UseUnderline">True</property>
+                        <property name="Group">project</property>
                       </widget>
                       <packing>
-                        <property name="Position">2</property>
-                        <property name="AutoSize">False</property>
+                        <property name="Position">0</property>
+                        <property name="AutoSize">True</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="Gtk.HBox" id="hbox2">
+                      <widget class="Gtk.Image" id="image63">
                         <property name="MemberName" />
-                        <property name="Spacing">6</property>
-                        <child>
-                          <widget class="Gtk.RadioButton" id="liveradiobutton">
-                            <property name="MemberName" />
-                            <property name="CanFocus">True</property>
-                            <property name="Label" translatable="yes">Live project using a capture 
device</property>
-                            <property name="DrawIndicator">True</property>
-                            <property name="HasLabel">True</property>
-                            <property name="UseUnderline">True</property>
-                            <property name="Group">project</property>
-                          </widget>
-                          <packing>
-                            <property name="Position">0</property>
-                            <property name="AutoSize">True</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="Gtk.Image" id="image63">
-                            <property name="MemberName" />
-                            <property name="Pixbuf">resource:camera-video.png</property>
-                          </widget>
-                          <packing>
-                            <property name="Position">1</property>
-                            <property name="AutoSize">False</property>
-                          </packing>
-                        </child>
+                        <property name="Pixbuf">resource:camera-video.png</property>
                       </widget>
                       <packing>
-                        <property name="Position">3</property>
+                        <property name="Position">1</property>
                         <property name="AutoSize">False</property>
                       </packing>
                     </child>
+                  </widget>
+                  <packing>
+                    <property name="Position">2</property>
+                    <property name="AutoSize">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="Gtk.HBox" id="hbox4">
+                    <property name="MemberName" />
+                    <property name="Spacing">6</property>
                     <child>
-                      <widget class="Gtk.HBox" id="hbox4">
+                      <widget class="Gtk.RadioButton" id="fakeliveradiobutton">
                         <property name="MemberName" />
-                        <property name="Spacing">6</property>
-                        <child>
-                          <widget class="Gtk.RadioButton" id="fakeliveradiobutton">
-                            <property name="MemberName" />
-                            <property name="CanFocus">True</property>
-                            <property name="Label" translatable="yes">Live project using a fake capture 
device</property>
-                            <property name="DrawIndicator">True</property>
-                            <property name="HasLabel">True</property>
-                            <property name="UseUnderline">True</property>
-                            <property name="Group">project</property>
-                          </widget>
-                          <packing>
-                            <property name="Position">0</property>
-                            <property name="AutoSize">True</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="Gtk.Image" id="image62">
-                            <property name="MemberName" />
-                            <property name="Pixbuf">resource:camera-video.png</property>
-                          </widget>
-                          <packing>
-                            <property name="Position">1</property>
-                            <property name="AutoSize">False</property>
-                          </packing>
-                        </child>
+                        <property name="CanFocus">True</property>
+                        <property name="Label" translatable="yes">Live project using a fake capture 
device</property>
+                        <property name="DrawIndicator">True</property>
+                        <property name="HasLabel">True</property>
+                        <property name="UseUnderline">True</property>
+                        <property name="Group">project</property>
                       </widget>
                       <packing>
-                        <property name="Position">4</property>
-                        <property name="AutoSize">False</property>
+                        <property name="Position">0</property>
+                        <property name="AutoSize">True</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="Gtk.HBox" id="ipcamerabox">
+                      <widget class="Gtk.Image" id="image62">
                         <property name="MemberName" />
-                        <property name="Spacing">6</property>
-                        <child>
-                          <widget class="Gtk.RadioButton" id="uriliveradiobutton">
-                            <property name="MemberName" />
-                            <property name="CanFocus">True</property>
-                            <property name="Label" translatable="yes">Live project using an IP 
camera</property>
-                            <property name="DrawIndicator">True</property>
-                            <property name="HasLabel">True</property>
-                            <property name="UseUnderline">True</property>
-                            <property name="Group">project</property>
-                          </widget>
-                          <packing>
-                            <property name="Position">0</property>
-                            <property name="AutoSize">True</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="Gtk.Image" id="image64">
-                            <property name="MemberName" />
-                            <property name="Pixbuf">resource:camera-video.png</property>
-                          </widget>
-                          <packing>
-                            <property name="Position">1</property>
-                            <property name="AutoSize">False</property>
-                          </packing>
-                        </child>
+                        <property name="Pixbuf">resource:camera-video.png</property>
                       </widget>
                       <packing>
-                        <property name="Position">5</property>
+                        <property name="Position">1</property>
                         <property name="AutoSize">False</property>
                       </packing>
                     </child>
                   </widget>
-                </child>
-                <child>
-                  <widget class="Gtk.Label" id="label1">
-                    <property name="MemberName" />
-                    <property name="LabelProp" translatable="yes">page1</property>
-                  </widget>
                   <packing>
-                    <property name="type">tab</property>
+                    <property name="Position">3</property>
+                    <property name="AutoSize">False</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="Gtk.VBox" id="vbox4">
+                  <widget class="Gtk.HBox" id="ipcamerabox">
                     <property name="MemberName" />
                     <property name="Spacing">6</property>
                     <child>
-                      <widget class="Gtk.Label" id="label4">
+                      <widget class="Gtk.RadioButton" id="uriliveradiobutton">
                         <property name="MemberName" />
-                        <property name="LabelProp" translatable="yes">&lt;b&gt;Project 
properties&lt;/b&gt;</property>
-                        <property name="UseMarkup">True</property>
-                        <property name="Justify">Center</property>
+                        <property name="CanFocus">True</property>
+                        <property name="Label" translatable="yes">Live project using an IP camera</property>
+                        <property name="DrawIndicator">True</property>
+                        <property name="HasLabel">True</property>
+                        <property name="UseUnderline">True</property>
+                        <property name="Group">project</property>
                       </widget>
                       <packing>
                         <property name="Position">0</property>
-                        <property name="AutoSize">False</property>
-                        <property name="Expand">False</property>
-                        <property name="Padding">20</property>
+                        <property name="AutoSize">True</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="Gtk.HSeparator" id="hseparator2">
+                      <widget class="Gtk.Image" id="image64">
                         <property name="MemberName" />
+                        <property name="Pixbuf">resource:camera-video.png</property>
                       </widget>
                       <packing>
                         <property name="Position">1</property>
-                        <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
+                        <property name="AutoSize">False</property>
                       </packing>
                     </child>
+                  </widget>
+                  <packing>
+                    <property name="Position">4</property>
+                    <property name="AutoSize">False</property>
+                  </packing>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="Gtk.Label" id="label1">
+                <property name="MemberName" />
+                <property name="LabelProp" translatable="yes">page1</property>
+              </widget>
+              <packing>
+                <property name="type">tab</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="Gtk.VBox" id="vbox5">
+                <property name="MemberName" />
+                <property name="Spacing">6</property>
+                <child>
+                  <widget class="Gtk.Alignment" id="alignment1">
+                    <property name="MemberName" />
                     <child>
-                      <widget class="Gtk.Table" id="table1">
+                      <widget class="Gtk.HBox" id="topbox">
                         <property name="MemberName" />
-                        <property name="NRows">3</property>
-                        <property name="NColumns">4</property>
-                        <property name="Homogeneous">True</property>
-                        <property name="RowSpacing">6</property>
-                        <property name="ColumnSpacing">6</property>
-                        <child>
-                          <placeholder />
-                        </child>
-                        <child>
-                          <placeholder />
-                        </child>
-                        <child>
-                          <widget class="Gtk.Entry" id="competitionentry">
-                            <property name="MemberName" />
-                            <property name="CanFocus">True</property>
-                            <property name="IsEditable">True</property>
-                            <property name="InvisibleChar">●</property>
-                          </widget>
-                          <packing>
-                            <property name="LeftAttach">3</property>
-                            <property name="RightAttach">4</property>
-                            <property name="AutoSize">False</property>
-                            <property name="XOptions">Fill</property>
-                            <property name="YOptions">Fill</property>
-                            <property name="XExpand">False</property>
-                            <property name="XFill">True</property>
-                            <property name="XShrink">False</property>
-                            <property name="YExpand">False</property>
-                            <property name="YFill">True</property>
-                            <property name="YShrink">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="Gtk.Label" id="Competitionlabel">
-                            <property name="MemberName" />
-                            <property name="LabelProp" translatable="yes">Competition:</property>
-                          </widget>
-                          <packing>
-                            <property name="LeftAttach">2</property>
-                            <property name="RightAttach">3</property>
-                            <property name="AutoSize">False</property>
-                            <property name="XOptions">Fill</property>
-                            <property name="YOptions">Fill</property>
-                            <property name="XExpand">False</property>
-                            <property name="XFill">True</property>
-                            <property name="XShrink">False</property>
-                            <property name="YExpand">False</property>
-                            <property name="YFill">True</property>
-                            <property name="YShrink">False</property>
-                          </packing>
-                        </child>
+                        <property name="Spacing">6</property>
                         <child>
-                          <widget class="Gtk.HBox" id="hbox5">
+                          <widget class="Gtk.Table" id="lefttable">
                             <property name="MemberName" />
+                            <property name="NRows">3</property>
+                            <property name="NColumns">2</property>
+                            <property name="RowSpacing">6</property>
+                            <property name="ColumnSpacing">6</property>
                             <child>
-                              <widget class="Gtk.Label" id="datelabel">
-                                <property name="MemberName" />
-                              </widget>
-                              <packing>
-                                <property name="Position">0</property>
-                                <property name="AutoSize">False</property>
-                                <property name="Fill">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Button" id="calendarbutton">
+                              <widget class="Gtk.Entry" id="competitionentry">
                                 <property name="MemberName" />
                                 <property name="CanFocus">True</property>
-                                <property name="Type">TextAndIcon</property>
-                                <property name="Icon">stock:stock_calendar Button</property>
-                                <property name="Label" translatable="yes" />
-                                <property name="UseUnderline">True</property>
+                                <property name="IsEditable">True</property>
+                                <property name="InvisibleChar">●</property>
                               </widget>
                               <packing>
-                                <property name="Position">1</property>
+                                <property name="TopAttach">1</property>
+                                <property name="BottomAttach">2</property>
+                                <property name="LeftAttach">1</property>
+                                <property name="RightAttach">2</property>
                                 <property name="AutoSize">True</property>
-                                <property name="Expand">False</property>
-                                <property name="Fill">False</property>
+                                <property name="XOptions">Fill</property>
+                                <property name="YOptions">Fill</property>
+                                <property name="XExpand">False</property>
+                                <property name="XFill">True</property>
+                                <property name="XShrink">False</property>
+                                <property name="YExpand">False</property>
+                                <property name="YFill">True</property>
+                                <property name="YShrink">False</property>
                               </packing>
                             </child>
-                          </widget>
-                          <packing>
-                            <property name="TopAttach">1</property>
-                            <property name="BottomAttach">2</property>
-                            <property name="LeftAttach">3</property>
-                            <property name="RightAttach">4</property>
-                            <property name="AutoSize">True</property>
-                            <property name="XOptions">Fill</property>
-                            <property name="YOptions">Fill</property>
-                            <property name="XExpand">False</property>
-                            <property name="XFill">True</property>
-                            <property name="XShrink">False</property>
-                            <property name="YExpand">False</property>
-                            <property name="YFill">True</property>
-                            <property name="YShrink">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="Gtk.HBox" id="hbox9">
-                            <property name="MemberName" />
-                            <property name="Spacing">6</property>
                             <child>
-                              <widget class="Gtk.SpinButton" id="localSpinButton">
-                                <property name="MemberName">localSpinButton</property>
-                                <property name="CanFocus">True</property>
-                                <property name="Upper">1000</property>
-                                <property name="PageIncrement">10</property>
-                                <property name="StepIncrement">1</property>
-                                <property name="ClimbRate">1</property>
-                                <property name="Numeric">True</property>
+                              <widget class="Gtk.Label" id="Competitionlabel">
+                                <property name="MemberName" />
+                                <property name="Xalign">1</property>
+                                <property name="LabelProp" translatable="yes">Competition</property>
                               </widget>
                               <packing>
-                                <property name="Position">0</property>
-                                <property name="AutoSize">False</property>
-                                <property name="Fill">False</property>
+                                <property name="TopAttach">1</property>
+                                <property name="BottomAttach">2</property>
+                                <property name="AutoSize">True</property>
+                                <property name="XOptions">Fill</property>
+                                <property name="YOptions">Fill</property>
+                                <property name="XExpand">False</property>
+                                <property name="XFill">True</property>
+                                <property name="XShrink">False</property>
+                                <property name="YExpand">False</property>
+                                <property name="YFill">True</property>
+                                <property name="YShrink">False</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="Gtk.Label" id="label2">
+                              <widget class="Gtk.Label" id="datelabel2">
                                 <property name="MemberName" />
-                                <property name="LabelProp" translatable="yes">-</property>
+                                <property name="Xalign">1</property>
+                                <property name="LabelProp" translatable="yes">Date</property>
                               </widget>
                               <packing>
-                                <property name="Position">1</property>
+                                <property name="TopAttach">2</property>
+                                <property name="BottomAttach">3</property>
                                 <property name="AutoSize">True</property>
-                                <property name="Expand">False</property>
-                                <property name="Fill">False</property>
+                                <property name="XOptions">Fill</property>
+                                <property name="YOptions">Fill</property>
+                                <property name="XExpand">False</property>
+                                <property name="XFill">True</property>
+                                <property name="XShrink">False</property>
+                                <property name="YExpand">False</property>
+                                <property name="YFill">True</property>
+                                <property name="YShrink">False</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="Gtk.SpinButton" id="visitorSpinButton">
-                                <property name="MemberName">visitorSpinButton</property>
-                                <property name="CanFocus">True</property>
-                                <property name="Upper">1000</property>
-                                <property name="PageIncrement">10</property>
-                                <property name="StepIncrement">1</property>
-                                <property name="ClimbRate">1</property>
-                                <property name="Numeric">True</property>
+                              <widget class="LongoMatch.Gui.Component.DatePicker" id="datepicker1">
+                                <property name="MemberName" />
+                                <property name="Events">ButtonPressMask</property>
+                                <property name="Date">0</property>
                               </widget>
                               <packing>
-                                <property name="Position">2</property>
+                                <property name="TopAttach">2</property>
+                                <property name="BottomAttach">3</property>
+                                <property name="LeftAttach">1</property>
+                                <property name="RightAttach">2</property>
                                 <property name="AutoSize">False</property>
-                                <property name="Fill">False</property>
+                                <property name="XOptions">0</property>
+                                <property name="YOptions">0</property>
+                                <property name="XExpand">False</property>
+                                <property name="XFill">False</property>
+                                <property name="XShrink">False</property>
+                                <property name="YExpand">False</property>
+                                <property name="YFill">False</property>
+                                <property name="YShrink">False</property>
                               </packing>
                             </child>
-                          </widget>
-                          <packing>
-                            <property name="TopAttach">1</property>
-                            <property name="BottomAttach">2</property>
-                            <property name="LeftAttach">1</property>
-                            <property name="RightAttach">2</property>
-                            <property name="AutoSize">True</property>
-                            <property name="XOptions">Fill</property>
-                            <property name="YOptions">Fill</property>
-                            <property name="XExpand">False</property>
-                            <property name="XFill">True</property>
-                            <property name="XShrink">False</property>
-                            <property name="YExpand">False</property>
-                            <property name="YFill">True</property>
-                            <property name="YShrink">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="Gtk.Label" id="label11">
-                            <property name="MemberName" />
-                            <property name="LabelProp" translatable="yes">Score:</property>
-                          </widget>
-                          <packing>
-                            <property name="TopAttach">1</property>
-                            <property name="BottomAttach">2</property>
-                            <property name="AutoSize">False</property>
-                            <property name="XOptions">Fill</property>
-                            <property name="YOptions">Fill</property>
-                            <property name="XExpand">False</property>
-                            <property name="XFill">True</property>
-                            <property name="XShrink">False</property>
-                            <property name="YExpand">False</property>
-                            <property name="YFill">True</property>
-                            <property name="YShrink">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="Gtk.Label" id="label5">
-                            <property name="MemberName" />
-                            <property name="LabelProp" translatable="yes">Date:</property>
-                          </widget>
-                          <packing>
-                            <property name="TopAttach">1</property>
-                            <property name="BottomAttach">2</property>
-                            <property name="LeftAttach">2</property>
-                            <property name="RightAttach">3</property>
-                            <property name="AutoSize">False</property>
-                            <property name="XOptions">Fill</property>
-                            <property name="YOptions">Fill</property>
-                            <property name="XExpand">False</property>
-                            <property name="XFill">True</property>
-                            <property name="XShrink">False</property>
-                            <property name="YExpand">False</property>
-                            <property name="YFill">True</property>
-                            <property name="YShrink">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="Gtk.Label" id="label9">
-                            <property name="MemberName" />
-                            <property name="LabelProp" translatable="yes">Analisys Template:</property>
-                          </widget>
-                          <packing>
-                            <property name="TopAttach">2</property>
-                            <property name="BottomAttach">3</property>
-                            <property name="AutoSize">False</property>
-                            <property name="XOptions">Fill</property>
-                            <property name="YOptions">Fill</property>
-                            <property name="XExpand">False</property>
-                            <property name="XFill">True</property>
-                            <property name="XShrink">False</property>
-                            <property name="YExpand">False</property>
-                            <property name="YFill">True</property>
-                            <property name="YShrink">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="Gtk.Entry" id="seasonentry">
-                            <property name="MemberName" />
-                            <property name="CanFocus">True</property>
-                            <property name="IsEditable">True</property>
-                            <property name="InvisibleChar">●</property>
-                          </widget>
-                          <packing>
-                            <property name="LeftAttach">1</property>
-                            <property name="RightAttach">2</property>
-                            <property name="AutoSize">False</property>
-                            <property name="XOptions">Fill</property>
-                            <property name="YOptions">Fill</property>
-                            <property name="XExpand">False</property>
-                            <property name="XFill">True</property>
-                            <property name="XShrink">False</property>
-                            <property name="YExpand">False</property>
-                            <property name="YFill">True</property>
-                            <property name="YShrink">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="Gtk.Label" id="seasonlabel">
-                            <property name="MemberName" />
-                            <property name="LabelProp" translatable="yes">Season:</property>
-                          </widget>
-                          <packing>
-                            <property name="AutoSize">False</property>
-                            <property name="YOptions">Fill</property>
-                            <property name="XExpand">True</property>
-                            <property name="XFill">True</property>
-                            <property name="XShrink">False</property>
-                            <property name="YExpand">False</property>
-                            <property name="YFill">True</property>
-                            <property name="YShrink">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="Gtk.ComboBox" id="tagscombobox">
-                            <property name="MemberName" />
-                            <property name="IsTextCombo">True</property>
-                            <property name="Items" translatable="yes" />
-                          </widget>
-                          <packing>
-                            <property name="TopAttach">2</property>
-                            <property name="BottomAttach">3</property>
-                            <property name="LeftAttach">1</property>
-                            <property name="RightAttach">2</property>
-                            <property name="AutoSize">False</property>
-                            <property name="XOptions">Fill</property>
-                            <property name="YOptions">Fill</property>
-                            <property name="XExpand">False</property>
-                            <property name="XFill">True</property>
-                            <property name="XShrink">False</property>
-                            <property name="YExpand">False</property>
-                            <property name="YFill">True</property>
-                            <property name="YShrink">False</property>
-                          </packing>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="Position">2</property>
-                        <property name="AutoSize">False</property>
-                        <property name="Expand">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.HSeparator" id="hseparator3">
-                        <property name="MemberName" />
-                      </widget>
-                      <packing>
-                        <property name="Position">3</property>
-                        <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.Table" id="filetable">
-                        <property name="MemberName" />
-                        <property name="Visible">False</property>
-                        <property name="NColumns">4</property>
-                        <property name="Homogeneous">True</property>
-                        <property name="RowSpacing">6</property>
-                        <property name="ColumnSpacing">6</property>
-                        <child>
-                          <placeholder />
-                        </child>
-                        <child>
-                          <placeholder />
-                        </child>
-                        <child>
-                          <widget class="Gtk.HBox" id="filehbox">
-                            <property name="MemberName" />
-                            <property name="Spacing">6</property>
                             <child>
-                              <widget class="Gtk.Entry" id="fileEntry">
+                              <widget class="Gtk.Entry" id="seasonentry">
                                 <property name="MemberName" />
                                 <property name="CanFocus">True</property>
-                                <property name="IsEditable">False</property>
-                                <property name="HasFrame">False</property>
+                                <property name="IsEditable">True</property>
                                 <property name="InvisibleChar">●</property>
                               </widget>
                               <packing>
-                                <property name="Position">0</property>
+                                <property name="LeftAttach">1</property>
+                                <property name="RightAttach">2</property>
                                 <property name="AutoSize">False</property>
+                                <property name="XOptions">Fill</property>
+                                <property name="YOptions">Fill</property>
+                                <property name="XExpand">False</property>
+                                <property name="XFill">True</property>
+                                <property name="XShrink">False</property>
+                                <property name="YExpand">False</property>
+                                <property name="YFill">True</property>
+                                <property name="YShrink">False</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="Gtk.Button" id="openbutton">
+                              <widget class="Gtk.Label" id="seasonlabel">
                                 <property name="MemberName" />
-                                <property name="CanFocus">True</property>
-                                <property name="Type">TextAndIcon</property>
-                                <property name="Icon">stock:gtk-open Menu</property>
-                                <property name="Label" translatable="yes" />
-                                <property name="UseUnderline">True</property>
+                                <property name="Xalign">1</property>
+                                <property name="LabelProp" translatable="yes">Season</property>
                               </widget>
                               <packing>
-                                <property name="Position">1</property>
                                 <property name="AutoSize">False</property>
-                                <property name="Expand">False</property>
+                                <property name="YOptions">Fill</property>
+                                <property name="XExpand">True</property>
+                                <property name="XFill">True</property>
+                                <property name="XShrink">False</property>
+                                <property name="YExpand">False</property>
+                                <property name="YFill">True</property>
+                                <property name="YShrink">False</property>
                               </packing>
                             </child>
                           </widget>
                           <packing>
-                            <property name="LeftAttach">1</property>
-                            <property name="RightAttach">2</property>
-                            <property name="AutoSize">True</property>
-                            <property name="YOptions">Fill</property>
-                            <property name="XExpand">True</property>
-                            <property name="XFill">True</property>
-                            <property name="XShrink">False</property>
-                            <property name="YExpand">False</property>
-                            <property name="YFill">True</property>
-                            <property name="YShrink">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="Gtk.Label" id="filelabel">
-                            <property name="MemberName" />
-                            <property name="LabelProp" translatable="yes">File:</property>
-                          </widget>
-                          <packing>
+                            <property name="Position">0</property>
                             <property name="AutoSize">True</property>
-                            <property name="XOptions">Fill</property>
-                            <property name="YOptions">Fill</property>
-                            <property name="XExpand">False</property>
-                            <property name="XFill">True</property>
-                            <property name="XShrink">False</property>
-                            <property name="YExpand">False</property>
-                            <property name="YFill">True</property>
-                            <property name="YShrink">False</property>
+                            <property name="Expand">False</property>
+                            <property name="Fill">False</property>
                           </packing>
                         </child>
-                      </widget>
-                      <packing>
-                        <property name="Position">4</property>
-                        <property name="AutoSize">False</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.Table" id="outputfiletable">
-                        <property name="MemberName" />
-                        <property name="Visible">False</property>
-                        <property name="NColumns">4</property>
-                        <property name="Homogeneous">True</property>
-                        <property name="RowSpacing">6</property>
-                        <property name="ColumnSpacing">6</property>
-                        <child>
-                          <placeholder />
-                        </child>
                         <child>
-                          <placeholder />
-                        </child>
-                        <child>
-                          <widget class="Gtk.HBox" id="outputfilehbox1">
+                          <widget class="Gtk.VBox" id="centerbox">
                             <property name="MemberName" />
+                            <property name="WidthRequest">500</property>
                             <property name="Spacing">6</property>
                             <child>
-                              <widget class="Gtk.Entry" id="outfileEntry">
+                              <widget class="Gtk.HBox" id="hbox15">
                                 <property name="MemberName" />
-                                <property name="CanFocus">True</property>
-                                <property name="IsEditable">False</property>
-                                <property name="HasFrame">False</property>
-                                <property name="InvisibleChar">●</property>
+                                <property name="HeightRequest">60</property>
+                                <child>
+                                  <widget class="LongoMatch.Gui.Component.TeamsComboBox" 
id="hometeamscombobox">
+                                    <property name="MemberName" />
+                                    <property name="Events">ButtonPressMask</property>
+                                    <property name="IsTextCombo">False</property>
+                                    <property name="Items" translatable="yes" />
+                                  </widget>
+                                  <packing>
+                                    <property name="Position">0</property>
+                                    <property name="AutoSize">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="Gtk.Image" id="vsimage">
+                                    <property name="MemberName" />
+                                    <property name="Pixbuf">stock:longomatch-vs Dialog</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="Position">1</property>
+                                    <property name="AutoSize">True</property>
+                                    <property name="Expand">False</property>
+                                    <property name="Fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="LongoMatch.Gui.Component.TeamsComboBox" 
id="awayteamscombobox">
+                                    <property name="MemberName" />
+                                    <property name="IsTextCombo">False</property>
+                                    <property name="Items" translatable="yes" />
+                                  </widget>
+                                  <packing>
+                                    <property name="Position">2</property>
+                                    <property name="AutoSize">False</property>
+                                  </packing>
+                                </child>
                               </widget>
                               <packing>
                                 <property name="Position">0</property>
-                                <property name="AutoSize">False</property>
+                                <property name="AutoSize">True</property>
+                                <property name="Expand">False</property>
+                                <property name="Fill">False</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="Gtk.Button" id="savebutton">
+                              <widget class="Gtk.Label" id="filelabel">
                                 <property name="MemberName" />
-                                <property name="CanFocus">True</property>
-                                <property name="Type">TextAndIcon</property>
-                                <property name="Icon">stock:gtk-save-as Menu</property>
-                                <property name="Label" translatable="yes" />
-                                <property name="UseUnderline">True</property>
+                                <property name="Xalign">0</property>
+                                <property name="LabelProp" translatable="yes">Video files</property>
                               </widget>
                               <packing>
                                 <property name="Position">1</property>
-                                <property name="AutoSize">False</property>
+                                <property name="AutoSize">True</property>
                                 <property name="Expand">False</property>
-                              </packing>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="LeftAttach">1</property>
-                            <property name="RightAttach">2</property>
-                            <property name="AutoSize">False</property>
-                            <property name="YOptions">0</property>
-                            <property name="XExpand">True</property>
-                            <property name="XFill">True</property>
-                            <property name="XShrink">False</property>
-                            <property name="YExpand">False</property>
-                            <property name="YFill">False</property>
-                            <property name="YShrink">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="Gtk.Label" id="outputfilelabel">
-                            <property name="MemberName" />
-                            <property name="LabelProp" translatable="yes">Output file:</property>
-                          </widget>
-                          <packing>
-                            <property name="AutoSize">True</property>
-                            <property name="XOptions">Fill</property>
-                            <property name="YOptions">Fill</property>
-                            <property name="XExpand">False</property>
-                            <property name="XFill">True</property>
-                            <property name="XShrink">False</property>
-                            <property name="YExpand">False</property>
-                            <property name="YFill">True</property>
-                            <property name="YShrink">False</property>
-                          </packing>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="Position">5</property>
-                        <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.Table" id="capturetable">
-                        <property name="MemberName" />
-                        <property name="Visible">False</property>
-                        <property name="NRows">2</property>
-                        <property name="NColumns">4</property>
-                        <property name="Homogeneous">True</property>
-                        <property name="RowSpacing">6</property>
-                        <property name="ColumnSpacing">6</property>
-                        <child>
-                          <widget class="Gtk.ComboBox" id="encodingcombobox">
-                            <property name="MemberName" />
-                            <property name="IsTextCombo">True</property>
-                            <property name="Items" translatable="yes" />
-                          </widget>
-                          <packing>
-                            <property name="LeftAttach">3</property>
-                            <property name="RightAttach">4</property>
-                            <property name="AutoSize">True</property>
-                            <property name="XOptions">Fill</property>
-                            <property name="YOptions">Fill</property>
-                            <property name="XExpand">False</property>
-                            <property name="XFill">True</property>
-                            <property name="XShrink">False</property>
-                            <property name="YExpand">False</property>
-                            <property name="YFill">True</property>
-                            <property name="YShrink">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="Gtk.HBox" id="hbox6">
-                            <property name="MemberName" />
-                            <property name="Spacing">6</property>
-                            <child>
-                              <widget class="Gtk.Label" id="device">
-                                <property name="MemberName" />
-                                <property name="Visible">False</property>
-                                <property name="LabelProp" translatable="yes">Device:</property>
-                              </widget>
-                              <packing>
-                                <property name="Position">0</property>
-                                <property name="AutoSize">False</property>
+                                <property name="Fill">False</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="Gtk.Label" id="urilabel">
+                              <widget class="Gtk.Table" id="filetable">
                                 <property name="MemberName" />
-                                <property name="Visible">False</property>
-                                <property name="LabelProp" translatable="yes">URL:</property>
+                                <property name="NRows">2</property>
+                                <property name="NColumns">2</property>
+                                <property name="RowSpacing">6</property>
+                                <property name="ColumnSpacing">6</property>
+                                <child>
+                                  <placeholder />
+                                </child>
+                                <child>
+                                  <placeholder />
+                                </child>
+                                <child>
+                                  <widget class="LongoMatch.Gui.Component.MediaFileChooser" 
id="mediafilechooser1">
+                                    <property name="MemberName" />
+                                    <property name="Events">ButtonPressMask</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="AutoSize">False</property>
+                                    <property name="YOptions">Fill</property>
+                                    <property name="XExpand">True</property>
+                                    <property name="XFill">True</property>
+                                    <property name="XShrink">False</property>
+                                    <property name="YExpand">False</property>
+                                    <property name="YFill">True</property>
+                                    <property name="YShrink">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="LongoMatch.Gui.Component.MediaFileChooser" 
id="mediafilechooser2">
+                                    <property name="MemberName" />
+                                    <property name="Events">ButtonPressMask</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="LeftAttach">1</property>
+                                    <property name="RightAttach">2</property>
+                                    <property name="AutoSize">False</property>
+                                    <property name="YOptions">Fill</property>
+                                    <property name="XExpand">True</property>
+                                    <property name="XFill">True</property>
+                                    <property name="XShrink">False</property>
+                                    <property name="YExpand">False</property>
+                                    <property name="YFill">True</property>
+                                    <property name="YShrink">False</property>
+                                  </packing>
+                                </child>
                               </widget>
                               <packing>
-                                <property name="Position">1</property>
-                                <property name="AutoSize">False</property>
+                                <property name="Position">2</property>
+                                <property name="AutoSize">True</property>
                               </packing>
                             </child>
-                          </widget>
-                          <packing>
-                            <property name="AutoSize">False</property>
-                            <property name="XOptions">Fill</property>
-                            <property name="YOptions">Fill</property>
-                            <property name="XExpand">False</property>
-                            <property name="XFill">True</property>
-                            <property name="XShrink">False</property>
-                            <property name="YExpand">False</property>
-                            <property name="YFill">True</property>
-                            <property name="YShrink">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="Gtk.HBox" id="hbox7">
-                            <property name="MemberName" />
-                            <property name="Spacing">6</property>
                             <child>
-                              <widget class="Gtk.ComboBox" id="devicecombobox">
+                              <widget class="Gtk.Table" id="outputfiletable">
                                 <property name="MemberName" />
-                                <property name="Visible">False</property>
-                                <property name="IsTextCombo">True</property>
-                                <property name="Items" translatable="yes" />
+                                <property name="NColumns">2</property>
+                                <property name="RowSpacing">6</property>
+                                <property name="ColumnSpacing">6</property>
+                                <child>
+                                  <widget class="Gtk.HBox" id="outputfilehbox1">
+                                    <property name="MemberName" />
+                                    <property name="Spacing">6</property>
+                                    <child>
+                                      <widget class="Gtk.Entry" id="outfileEntry">
+                                        <property name="MemberName" />
+                                        <property name="CanFocus">True</property>
+                                        <property name="IsEditable">False</property>
+                                        <property name="HasFrame">False</property>
+                                        <property name="InvisibleChar">●</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="Position">0</property>
+                                        <property name="AutoSize">False</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="Gtk.Button" id="savebutton">
+                                        <property name="MemberName" />
+                                        <property name="CanFocus">True</property>
+                                        <property name="Type">TextAndIcon</property>
+                                        <property name="Icon">stock:gtk-save-as Menu</property>
+                                        <property name="Label" translatable="yes" />
+                                        <property name="UseUnderline">True</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="Position">1</property>
+                                        <property name="AutoSize">False</property>
+                                        <property name="Expand">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="LeftAttach">1</property>
+                                    <property name="RightAttach">2</property>
+                                    <property name="AutoSize">True</property>
+                                    <property name="YOptions">Fill</property>
+                                    <property name="XExpand">True</property>
+                                    <property name="XFill">True</property>
+                                    <property name="XShrink">False</property>
+                                    <property name="YExpand">False</property>
+                                    <property name="YFill">True</property>
+                                    <property name="YShrink">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="Gtk.Label" id="outputfilelabel">
+                                    <property name="MemberName" />
+                                    <property name="LabelProp" translatable="yes">Output file:</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="AutoSize">True</property>
+                                    <property name="XOptions">Fill</property>
+                                    <property name="YOptions">Fill</property>
+                                    <property name="XExpand">False</property>
+                                    <property name="XFill">True</property>
+                                    <property name="XShrink">False</property>
+                                    <property name="YExpand">False</property>
+                                    <property name="YFill">True</property>
+                                    <property name="YShrink">False</property>
+                                  </packing>
+                                </child>
                               </widget>
                               <packing>
-                                <property name="Position">0</property>
-                                <property name="AutoSize">False</property>
+                                <property name="Position">3</property>
+                                <property name="AutoSize">True</property>
+                                <property name="Expand">False</property>
+                                <property name="Fill">False</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="Gtk.Entry" id="urientry">
+                              <widget class="Gtk.Table" id="capturetable">
                                 <property name="MemberName" />
                                 <property name="Visible">False</property>
-                                <property name="CanFocus">True</property>
-                                <property name="IsEditable">True</property>
-                                <property name="InvisibleChar">•</property>
+                                <property name="NRows">2</property>
+                                <property name="NColumns">4</property>
+                                <property name="Homogeneous">True</property>
+                                <property name="RowSpacing">6</property>
+                                <property name="ColumnSpacing">6</property>
+                                <child>
+                                  <widget class="Gtk.ComboBox" id="encodingcombobox">
+                                    <property name="MemberName" />
+                                    <property name="IsTextCombo">True</property>
+                                    <property name="Items" translatable="yes" />
+                                  </widget>
+                                  <packing>
+                                    <property name="LeftAttach">3</property>
+                                    <property name="RightAttach">4</property>
+                                    <property name="AutoSize">True</property>
+                                    <property name="XOptions">Fill</property>
+                                    <property name="YOptions">Fill</property>
+                                    <property name="XExpand">False</property>
+                                    <property name="XFill">True</property>
+                                    <property name="XShrink">False</property>
+                                    <property name="YExpand">False</property>
+                                    <property name="YFill">True</property>
+                                    <property name="YShrink">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="Gtk.HBox" id="hbox6">
+                                    <property name="MemberName" />
+                                    <property name="Spacing">6</property>
+                                    <child>
+                                      <widget class="Gtk.Label" id="device">
+                                        <property name="MemberName" />
+                                        <property name="Visible">False</property>
+                                        <property name="LabelProp" translatable="yes">Device:</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="Position">0</property>
+                                        <property name="AutoSize">False</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="Gtk.Label" id="urilabel">
+                                        <property name="MemberName" />
+                                        <property name="Visible">False</property>
+                                        <property name="LabelProp" translatable="yes">URL:</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="Position">1</property>
+                                        <property name="AutoSize">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="AutoSize">False</property>
+                                    <property name="XOptions">Fill</property>
+                                    <property name="YOptions">Fill</property>
+                                    <property name="XExpand">False</property>
+                                    <property name="XFill">True</property>
+                                    <property name="XShrink">False</property>
+                                    <property name="YExpand">False</property>
+                                    <property name="YFill">True</property>
+                                    <property name="YShrink">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="Gtk.HBox" id="hbox7">
+                                    <property name="MemberName" />
+                                    <property name="Spacing">6</property>
+                                    <child>
+                                      <widget class="Gtk.ComboBox" id="devicecombobox">
+                                        <property name="MemberName" />
+                                        <property name="Visible">False</property>
+                                        <property name="IsTextCombo">True</property>
+                                        <property name="Items" translatable="yes" />
+                                      </widget>
+                                      <packing>
+                                        <property name="Position">0</property>
+                                        <property name="AutoSize">False</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="Gtk.Entry" id="urientry">
+                                        <property name="MemberName" />
+                                        <property name="Visible">False</property>
+                                        <property name="CanFocus">True</property>
+                                        <property name="IsEditable">True</property>
+                                        <property name="InvisibleChar">•</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="Position">1</property>
+                                        <property name="AutoSize">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="LeftAttach">1</property>
+                                    <property name="RightAttach">2</property>
+                                    <property name="AutoSize">True</property>
+                                    <property name="XOptions">Fill</property>
+                                    <property name="YOptions">Fill</property>
+                                    <property name="XExpand">False</property>
+                                    <property name="XFill">True</property>
+                                    <property name="XShrink">False</property>
+                                    <property name="YExpand">False</property>
+                                    <property name="YFill">True</property>
+                                    <property name="YShrink">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="Gtk.ComboBox" id="imagecombobox">
+                                    <property name="MemberName" />
+                                    <property name="IsTextCombo">True</property>
+                                    <property name="Items" translatable="yes" />
+                                  </widget>
+                                  <packing>
+                                    <property name="TopAttach">1</property>
+                                    <property name="BottomAttach">2</property>
+                                    <property name="LeftAttach">1</property>
+                                    <property name="RightAttach">2</property>
+                                    <property name="AutoSize">True</property>
+                                    <property name="XOptions">Fill</property>
+                                    <property name="YOptions">Fill</property>
+                                    <property name="XExpand">False</property>
+                                    <property name="XFill">True</property>
+                                    <property name="XShrink">False</property>
+                                    <property name="YExpand">False</property>
+                                    <property name="YFill">True</property>
+                                    <property name="YShrink">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="Gtk.ComboBox" id="qualitycombobox">
+                                    <property name="MemberName" />
+                                    <property name="IsTextCombo">True</property>
+                                    <property name="Items" translatable="yes" />
+                                  </widget>
+                                  <packing>
+                                    <property name="TopAttach">1</property>
+                                    <property name="BottomAttach">2</property>
+                                    <property name="LeftAttach">3</property>
+                                    <property name="RightAttach">4</property>
+                                    <property name="AutoSize">True</property>
+                                    <property name="XOptions">Fill</property>
+                                    <property name="YOptions">Fill</property>
+                                    <property name="XExpand">False</property>
+                                    <property name="XFill">True</property>
+                                    <property name="XShrink">False</property>
+                                    <property name="YExpand">False</property>
+                                    <property name="YFill">True</property>
+                                    <property name="YShrink">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="Gtk.Label" id="qualitylabel">
+                                    <property name="MemberName" />
+                                    <property name="LabelProp" translatable="yes">Quality:</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="TopAttach">1</property>
+                                    <property name="BottomAttach">2</property>
+                                    <property name="LeftAttach">2</property>
+                                    <property name="RightAttach">3</property>
+                                    <property name="AutoSize">True</property>
+                                    <property name="XOptions">Fill</property>
+                                    <property name="YOptions">Fill</property>
+                                    <property name="XExpand">False</property>
+                                    <property name="XFill">True</property>
+                                    <property name="XShrink">False</property>
+                                    <property name="YExpand">False</property>
+                                    <property name="YFill">True</property>
+                                    <property name="YShrink">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="Gtk.Label" id="sizelabel">
+                                    <property name="MemberName" />
+                                    <property name="LabelProp" translatable="yes">Image format:</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="TopAttach">1</property>
+                                    <property name="BottomAttach">2</property>
+                                    <property name="AutoSize">False</property>
+                                    <property name="YOptions">Fill</property>
+                                    <property name="XExpand">True</property>
+                                    <property name="XFill">True</property>
+                                    <property name="XShrink">False</property>
+                                    <property name="YExpand">False</property>
+                                    <property name="YFill">True</property>
+                                    <property name="YShrink">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="Gtk.Label" id="videoformatlabel">
+                                    <property name="MemberName" />
+                                    <property name="LabelProp" translatable="yes">Encoding format:</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="LeftAttach">2</property>
+                                    <property name="RightAttach">3</property>
+                                    <property name="AutoSize">True</property>
+                                    <property name="XOptions">Fill</property>
+                                    <property name="YOptions">Fill</property>
+                                    <property name="XExpand">False</property>
+                                    <property name="XFill">True</property>
+                                    <property name="XShrink">False</property>
+                                    <property name="YExpand">False</property>
+                                    <property name="YFill">True</property>
+                                    <property name="YShrink">False</property>
+                                  </packing>
+                                </child>
                               </widget>
                               <packing>
-                                <property name="Position">1</property>
-                                <property name="AutoSize">False</property>
+                                <property name="Position">4</property>
+                                <property name="AutoSize">True</property>
+                                <property name="Expand">False</property>
+                                <property name="Fill">False</property>
                               </packing>
                             </child>
                           </widget>
                           <packing>
-                            <property name="LeftAttach">1</property>
-                            <property name="RightAttach">2</property>
-                            <property name="AutoSize">True</property>
-                            <property name="XOptions">Fill</property>
-                            <property name="YOptions">Fill</property>
-                            <property name="XExpand">False</property>
-                            <property name="XFill">True</property>
-                            <property name="XShrink">False</property>
-                            <property name="YExpand">False</property>
-                            <property name="YFill">True</property>
-                            <property name="YShrink">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="Gtk.ComboBox" id="imagecombobox">
-                            <property name="MemberName" />
-                            <property name="IsTextCombo">True</property>
-                            <property name="Items" translatable="yes" />
-                          </widget>
-                          <packing>
-                            <property name="TopAttach">1</property>
-                            <property name="BottomAttach">2</property>
-                            <property name="LeftAttach">1</property>
-                            <property name="RightAttach">2</property>
-                            <property name="AutoSize">True</property>
-                            <property name="XOptions">Fill</property>
-                            <property name="YOptions">Fill</property>
-                            <property name="XExpand">False</property>
-                            <property name="XFill">True</property>
-                            <property name="XShrink">False</property>
-                            <property name="YExpand">False</property>
-                            <property name="YFill">True</property>
-                            <property name="YShrink">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="Gtk.ComboBox" id="qualitycombobox">
-                            <property name="MemberName" />
-                            <property name="IsTextCombo">True</property>
-                            <property name="Items" translatable="yes" />
-                          </widget>
-                          <packing>
-                            <property name="TopAttach">1</property>
-                            <property name="BottomAttach">2</property>
-                            <property name="LeftAttach">3</property>
-                            <property name="RightAttach">4</property>
-                            <property name="AutoSize">True</property>
-                            <property name="XOptions">Fill</property>
-                            <property name="YOptions">Fill</property>
-                            <property name="XExpand">False</property>
-                            <property name="XFill">True</property>
-                            <property name="XShrink">False</property>
-                            <property name="YExpand">False</property>
-                            <property name="YFill">True</property>
-                            <property name="YShrink">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="Gtk.Label" id="qualitylabel">
-                            <property name="MemberName" />
-                            <property name="LabelProp" translatable="yes">Quality:</property>
-                          </widget>
-                          <packing>
-                            <property name="TopAttach">1</property>
-                            <property name="BottomAttach">2</property>
-                            <property name="LeftAttach">2</property>
-                            <property name="RightAttach">3</property>
-                            <property name="AutoSize">True</property>
-                            <property name="XOptions">Fill</property>
-                            <property name="YOptions">Fill</property>
-                            <property name="XExpand">False</property>
-                            <property name="XFill">True</property>
-                            <property name="XShrink">False</property>
-                            <property name="YExpand">False</property>
-                            <property name="YFill">True</property>
-                            <property name="YShrink">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="Gtk.Label" id="sizelabel">
-                            <property name="MemberName" />
-                            <property name="LabelProp" translatable="yes">Image format:</property>
-                          </widget>
-                          <packing>
-                            <property name="TopAttach">1</property>
-                            <property name="BottomAttach">2</property>
+                            <property name="Position">1</property>
                             <property name="AutoSize">False</property>
-                            <property name="YOptions">Fill</property>
-                            <property name="XExpand">True</property>
-                            <property name="XFill">True</property>
-                            <property name="XShrink">False</property>
-                            <property name="YExpand">False</property>
-                            <property name="YFill">True</property>
-                            <property name="YShrink">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="Gtk.Label" id="videoformatlabel">
-                            <property name="MemberName" />
-                            <property name="LabelProp" translatable="yes">Encoding format:</property>
-                          </widget>
-                          <packing>
-                            <property name="LeftAttach">2</property>
-                            <property name="RightAttach">3</property>
-                            <property name="AutoSize">True</property>
-                            <property name="XOptions">Fill</property>
-                            <property name="YOptions">Fill</property>
-                            <property name="XExpand">False</property>
-                            <property name="XFill">True</property>
-                            <property name="XShrink">False</property>
-                            <property name="YExpand">False</property>
-                            <property name="YFill">True</property>
-                            <property name="YShrink">False</property>
+                            <property name="Fill">False</property>
                           </packing>
                         </child>
-                      </widget>
-                      <packing>
-                        <property name="Position">6</property>
-                        <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.VBox" id="vbox5">
-                        <property name="MemberName" />
-                        <property name="Spacing">6</property>
                         <child>
-                          <widget class="Gtk.HBox" id="hbox10">
+                          <widget class="Gtk.Table" id="righttable">
                             <property name="MemberName" />
-                            <property name="Spacing">6</property>
+                            <property name="NRows">3</property>
+                            <property name="NColumns">2</property>
+                            <property name="Homogeneous">True</property>
+                            <property name="RowSpacing">6</property>
+                            <property name="ColumnSpacing">6</property>
                             <child>
-                              <widget class="Gtk.Image" id="homeshieldimage">
-                                <property name="MemberName" />
-                              </widget>
-                              <packing>
-                                <property name="Position">0</property>
-                                <property name="AutoSize">True</property>
-                                <property name="Expand">False</property>
-                                <property name="Fill">False</property>
-                              </packing>
+                              <placeholder />
                             </child>
                             <child>
-                              <widget class="Gtk.Label" id="homelabel">
-                                <property name="MemberName" />
-                              </widget>
-                              <packing>
-                                <property name="Position">1</property>
-                                <property name="AutoSize">True</property>
-                                <property name="Expand">False</property>
-                                <property name="Fill">False</property>
-                              </packing>
+                              <placeholder />
                             </child>
                             <child>
-                              <widget class="Gtk.ComboBox" id="hometeamscombobox">
-                                <property name="MemberName" />
-                                <property name="IsTextCombo">True</property>
-                                <property name="Items" translatable="yes" />
-                              </widget>
-                              <packing>
-                                <property name="Position">2</property>
-                                <property name="AutoSize">False</property>
-                                <property name="Fill">False</property>
-                              </packing>
+                              <placeholder />
                             </child>
                             <child>
-                              <widget class="Gtk.ComboBox" id="awayteamscombobox">
-                                <property name="MemberName" />
-                                <property name="IsTextCombo">True</property>
-                                <property name="Items" translatable="yes" />
-                              </widget>
-                              <packing>
-                                <property name="Position">3</property>
-                                <property name="AutoSize">False</property>
-                                <property name="Fill">False</property>
-                              </packing>
+                              <placeholder />
                             </child>
                             <child>
-                              <widget class="Gtk.Label" id="awaylabel">
+                              <widget class="Gtk.Label" id="analysislabel">
                                 <property name="MemberName" />
+                                <property name="LabelProp" translatable="yes">Analisys Template:</property>
                               </widget>
                               <packing>
-                                <property name="Position">4</property>
                                 <property name="AutoSize">True</property>
-                                <property name="Expand">False</property>
-                                <property name="Fill">False</property>
+                                <property name="XOptions">Fill</property>
+                                <property name="YOptions">Fill</property>
+                                <property name="XExpand">False</property>
+                                <property name="XFill">True</property>
+                                <property name="XShrink">False</property>
+                                <property name="YExpand">False</property>
+                                <property name="YFill">True</property>
+                                <property name="YShrink">False</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="Gtk.Image" id="awayshieldimage">
+                              <widget class="Gtk.ComboBox" id="tagscombobox">
                                 <property name="MemberName" />
+                                <property name="IsTextCombo">True</property>
+                                <property name="Items" translatable="yes" />
                               </widget>
                               <packing>
-                                <property name="Position">5</property>
-                                <property name="AutoSize">True</property>
-                                <property name="Expand">False</property>
-                                <property name="Fill">False</property>
+                                <property name="LeftAttach">1</property>
+                                <property name="RightAttach">2</property>
+                                <property name="AutoSize">False</property>
+                                <property name="XOptions">Fill</property>
+                                <property name="YOptions">0</property>
+                                <property name="XExpand">False</property>
+                                <property name="XFill">True</property>
+                                <property name="XShrink">False</property>
+                                <property name="YExpand">False</property>
+                                <property name="YFill">False</property>
+                                <property name="YShrink">False</property>
                               </packing>
                             </child>
                           </widget>
                           <packing>
-                            <property name="Position">0</property>
-                            <property name="AutoSize">False</property>
+                            <property name="Position">2</property>
+                            <property name="AutoSize">True</property>
                             <property name="Expand">False</property>
                             <property name="Fill">False</property>
                           </packing>
                         </child>
-                        <child>
-                          <widget class="Gtk.DrawingArea" id="drawingarea1">
-                            <property name="MemberName" />
-                          </widget>
-                          <packing>
-                            <property name="Position">1</property>
-                            <property name="AutoSize">True</property>
-                          </packing>
-                        </child>
                       </widget>
-                      <packing>
-                        <property name="Position">7</property>
-                        <property name="AutoSize">True</property>
-                      </packing>
                     </child>
                   </widget>
                   <packing>
-                    <property name="Position">1</property>
-                    <property name="TabFill">False</property>
-                    <property name="MenuLabel" translatable="yes" />
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.Label" id="label3">
-                    <property name="MemberName" />
-                    <property name="LabelProp" translatable="yes">page2</property>
-                  </widget>
-                  <packing>
-                    <property name="type">tab</property>
+                    <property name="Position">0</property>
+                    <property name="AutoSize">True</property>
+                    <property name="Expand">False</property>
+                    <property name="Fill">False</property>
                   </packing>
                 </child>
                 <child>
@@ -7327,121 +7197,58 @@ You can continue with the current capture, cancel it or save your project.
                     <property name="MemberName" />
                     <property name="Spacing">6</property>
                     <child>
-                      <widget class="Gtk.Label" id="label8">
+                      <widget class="Gtk.DrawingArea" id="drawingarea">
                         <property name="MemberName" />
-                        <property name="LabelProp" translatable="yes">&lt;b&gt;Video 
synchronization&lt;/b&gt;</property>
-                        <property name="UseMarkup">True</property>
                       </widget>
                       <packing>
                         <property name="Position">0</property>
                         <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                        <property name="Padding">30</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.HSeparator" id="hseparator4">
-                        <property name="MemberName" />
-                      </widget>
-                      <packing>
-                        <property name="Position">1</property>
-                        <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="LongoMatch.Gui.Component.ProjectPeriods" id="projectperiods1">
-                        <property name="MemberName" />
-                        <property name="Events">ButtonPressMask</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">2</property>
-                        <property name="AutoSize">True</property>
                       </packing>
                     </child>
                   </widget>
                   <packing>
-                    <property name="Position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.Label" id="label7">
-                    <property name="MemberName" />
-                    <property name="LabelProp" translatable="yes">page3</property>
-                  </widget>
-                  <packing>
-                    <property name="type">tab</property>
+                    <property name="Position">1</property>
+                    <property name="AutoSize">True</property>
                   </packing>
                 </child>
               </widget>
               <packing>
                 <property name="Position">1</property>
-                <property name="AutoSize">False</property>
+                <property name="TabFill">False</property>
+                <property name="MenuLabel" translatable="yes" />
               </packing>
             </child>
-          </widget>
-          <packing>
-            <property name="Position">0</property>
-            <property name="AutoSize">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.HButtonBox" id="hbuttonbox2">
-            <property name="MemberName" />
-            <property name="Size">3</property>
-            <property name="LayoutStyle">Spread</property>
             <child>
-              <widget class="Gtk.Button" id="backbutton">
+              <widget class="Gtk.Label" id="label3">
                 <property name="MemberName" />
-                <property name="CanFocus">True</property>
-                <property name="Type">TextAndIcon</property>
-                <property name="Icon">stock:gtk-go-back Dialog</property>
-                <property name="Label" translatable="yes">_Back</property>
-                <property name="UseUnderline">True</property>
+                <property name="LabelProp" translatable="yes">page2</property>
               </widget>
               <packing>
-                <property name="Expand">False</property>
-                <property name="Fill">False</property>
+                <property name="type">tab</property>
               </packing>
             </child>
             <child>
-              <widget class="Gtk.Button" id="nextbutton">
+              <widget class="LongoMatch.Gui.Component.ProjectPeriods" id="projectperiods1">
                 <property name="MemberName" />
-                <property name="CanFocus">True</property>
-                <property name="Type">TextAndIcon</property>
-                <property name="Icon">stock:gtk-go-forward Dialog</property>
-                <property name="Label" translatable="yes">_Next</property>
-                <property name="UseUnderline">True</property>
+                <property name="Events">ButtonPressMask</property>
               </widget>
               <packing>
-                <property name="Position">1</property>
-                <property name="Expand">False</property>
-                <property name="Fill">False</property>
+                <property name="Position">2</property>
               </packing>
             </child>
             <child>
-              <widget class="Gtk.Button" id="createbutton">
+              <widget class="Gtk.Label" id="label7">
                 <property name="MemberName" />
-                <property name="Visible">False</property>
-                <property name="CanFocus">True</property>
-                <property name="Type">TextAndIcon</property>
-                <property name="Icon">stock:gtk-new Dialog</property>
-                <property name="Label" translatable="yes">Create project</property>
-                <property name="UseUnderline">True</property>
+                <property name="LabelProp" translatable="yes">page3</property>
               </widget>
               <packing>
-                <property name="Position">2</property>
-                <property name="Expand">False</property>
-                <property name="Fill">False</property>
+                <property name="type">tab</property>
               </packing>
             </child>
           </widget>
           <packing>
             <property name="Position">1</property>
-            <property name="AutoSize">False</property>
-            <property name="Expand">False</property>
+            <property name="AutoSize">True</property>
           </packing>
         </child>
       </widget>
@@ -7859,45 +7666,6 @@ You can continue with the current capture, cancel it or save your project.
                     <property name="AutoSize">True</property>
                   </packing>
                 </child>
-                <child>
-                  <widget class="Gtk.HBox" id="hbox7">
-                    <property name="MemberName" />
-                    <property name="Spacing">6</property>
-                    <child>
-                      <widget class="Gtk.ToggleButton" id="subsbutton">
-                        <property name="MemberName" />
-                        <property name="Type">TextAndIcon</property>
-                        <property name="Icon">stock:gtk-refresh Dialog</property>
-                        <property name="Label" translatable="yes" />
-                        <property name="UseUnderline">True</property>
-                        <property name="FocusOnClick">False</property>
-                        <property name="Active">True</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">0</property>
-                        <property name="AutoSize">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.Label" id="warninglabel">
-                        <property name="MemberName" />
-                        <property name="Visible">False</property>
-                        <property name="LabelProp" translatable="yes">Substitutions activated.
-Click 2 players to swap them</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">1</property>
-                        <property name="AutoSize">False</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="Position">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
-                  </packing>
-                </child>
               </widget>
               <packing>
                 <property name="Position">0</property>
@@ -9518,17 +9286,6 @@ Click 2 players to swap them</property>
     </child>
   </widget>
   <widget class="Gtk.Bin" id="LongoMatch.Gui.Component.CodingWidget" design-size="1305 494">
-    <action-group name="Timeline">
-      <action id="positionMode">
-        <property name="Type">Radio</property>
-        <property name="Label" translatable="yes" />
-        <property name="StockId">gtk-justify-fill</property>
-        <property name="DrawAsRadio">False</property>
-        <property name="Active">False</property>
-        <property name="Value">0</property>
-        <property name="Group">codingmode</property>
-      </action>
-    </action-group>
     <action-group name="Default">
       <action id="timelineMode">
         <property name="Type">Radio</property>
@@ -9565,6 +9322,17 @@ Click 2 players to swap them</property>
         <property name="Group">codingmode</property>
       </action>
     </action-group>
+    <action-group name="Timeline">
+      <action id="positionMode">
+        <property name="Type">Radio</property>
+        <property name="Label" translatable="yes" />
+        <property name="StockId">gtk-justify-fill</property>
+        <property name="DrawAsRadio">False</property>
+        <property name="Active">False</property>
+        <property name="Value">0</property>
+        <property name="Group">codingmode</property>
+      </action>
+    </action-group>
     <property name="MemberName" />
     <property name="Visible">False</property>
     <child>
@@ -9944,4 +9712,78 @@ Click 2 players to swap them</property>
       </widget>
     </child>
   </widget>
-</stetic-interface>
\ No newline at end of file
+  <widget class="Gtk.Bin" id="LongoMatch.Gui.Component.MediaFileChooser" design-size="300 29">
+    <property name="MemberName" />
+    <property name="Visible">False</property>
+    <child>
+      <widget class="Gtk.HBox" id="hbox1">
+        <property name="MemberName" />
+        <child>
+          <widget class="Gtk.Entry" id="fileentry">
+            <property name="MemberName" />
+            <property name="CanFocus">True</property>
+            <property name="IsEditable">False</property>
+            <property name="InvisibleChar">•</property>
+          </widget>
+          <packing>
+            <property name="Position">0</property>
+            <property name="AutoSize">True</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="Gtk.Button" id="addbutton">
+            <property name="MemberName" />
+            <property name="CanFocus">True</property>
+            <property name="Type">TextAndIcon</property>
+            <property name="Icon">stock:longomatch-browse Button</property>
+            <property name="Label" translatable="yes" />
+            <property name="UseUnderline">True</property>
+          </widget>
+          <packing>
+            <property name="Position">1</property>
+            <property name="AutoSize">True</property>
+            <property name="Expand">False</property>
+            <property name="Fill">False</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="Gtk.Bin" id="LongoMatch.Gui.Component.DatePicker" design-size="300 29">
+    <property name="MemberName" />
+    <property name="Visible">False</property>
+    <child>
+      <widget class="Gtk.HBox" id="hbox2">
+        <property name="MemberName" />
+        <child>
+          <widget class="Gtk.Entry" id="dateentry">
+            <property name="MemberName" />
+            <property name="CanFocus">True</property>
+            <property name="IsEditable">False</property>
+            <property name="InvisibleChar">•</property>
+          </widget>
+          <packing>
+            <property name="Position">0</property>
+            <property name="AutoSize">True</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="Gtk.Button" id="datebutton">
+            <property name="MemberName" />
+            <property name="CanFocus">True</property>
+            <property name="Type">TextAndIcon</property>
+            <property name="Icon">stock:longomatch-calendar Button</property>
+            <property name="Label" translatable="yes" />
+            <property name="UseUnderline">True</property>
+          </widget>
+          <packing>
+            <property name="Position">1</property>
+            <property name="AutoSize">True</property>
+            <property name="Expand">False</property>
+            <property name="Fill">False</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+</stetic-interface>
diff --git a/LongoMatch.GUI/gtk-gui/objects.xml b/LongoMatch.GUI/gtk-gui/objects.xml
index 2ff59e5..f9c37db 100644
--- a/LongoMatch.GUI/gtk-gui/objects.xml
+++ b/LongoMatch.GUI/gtk-gui/objects.xml
@@ -310,4 +310,20 @@
       </itemgroup>
     </signals>
   </object>
+  <object type="LongoMatch.Gui.Component.TeamsComboBox" palette-category="General" allow-children="false" 
base-type="Gtk.ComboBox">
+    <itemgroups />
+    <signals />
+  </object>
+  <object type="LongoMatch.Gui.Component.MediaFileChooser" palette-category="General" allow-children="false" 
base-type="Gtk.Bin">
+    <itemgroups />
+    <signals />
+  </object>
+  <object type="LongoMatch.Gui.Component.DatePicker" palette-category="General" allow-children="false" 
base-type="Gtk.Bin">
+    <itemgroups>
+      <itemgroup label="DatePicker Properties">
+        <property name="Date" />
+      </itemgroup>
+    </itemgroups>
+    <signals />
+  </object>
 </objects>
\ No newline at end of file
diff --git a/LongoMatch.Migration/Makefile.am b/LongoMatch.Migration/Makefile.am
index 617c0a1..b80b6fc 100644
--- a/LongoMatch.Migration/Makefile.am
+++ b/LongoMatch.Migration/Makefile.am
@@ -45,9 +45,15 @@ SOURCES = Common/Color.cs \
        MainWindow.cs \
        Program.cs \
        Properties/AssemblyInfo.cs \
+       Tests/CateogiresTest.cs \
+       Tests/TestProject.cs \
+       Tests/TestTeam.cs \
        gtk-gui/MainWindow.cs \
        gtk-gui/generated.cs
 
-RESOURCES = gtk-gui/gui.stetic
+RESOURCES = gtk-gui/gui.stetic \
+       Data/default.lct \
+       Data/default.ltt \
+       Data/project.lgm
 
 include $(top_srcdir)/build/build.mk
diff --git a/LongoMatch.Services/Services/Core.cs b/LongoMatch.Services/Services/Core.cs
index 592d673..e083d85 100644
--- a/LongoMatch.Services/Services/Core.cs
+++ b/LongoMatch.Services/Services/Core.cs
@@ -41,17 +41,6 @@ namespace LongoMatch.Services
                #if OSTYPE_WINDOWS
                [DllImport("libglib-2.0-0.dll") /* willfully unmapped */ ]
                static extern void g_setenv (String env, String val);
-
-               
-               
-               
-               
-               
-               
-               
-               
-               
-               
                
                #endif
                public static void Init ()
diff --git a/design/ui/player-card.jpg b/design/ui/player-card.jpg
new file mode 100644
index 0000000..a434c15
Binary files /dev/null and b/design/ui/player-card.jpg differ
diff --git a/design/ui/project-properties.jpg b/design/ui/project-properties.jpg
new file mode 100644
index 0000000..52d9556
Binary files /dev/null and b/design/ui/project-properties.jpg differ



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]