diff --git a/sources/VeloCity.Wpf.Presentation/SprintsArea/SprintOverview/GeneralInfoControl.xaml b/sources/VeloCity.Wpf.Presentation/SprintsArea/SprintOverview/GeneralInfoControl.xaml
index 118d212..d097538 100644
--- a/sources/VeloCity.Wpf.Presentation/SprintsArea/SprintOverview/GeneralInfoControl.xaml
+++ b/sources/VeloCity.Wpf.Presentation/SprintsArea/SprintOverview/GeneralInfoControl.xaml
@@ -55,93 +55,163 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
             </Style>
         </customControls:PanelWithTitle.Resources>
 
-        <StackPanel
-            HorizontalAlignment="Stretch"
-            Orientation="Vertical">
+        <Grid
+            HorizontalAlignment="Stretch">
+
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="15" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+
+            <!-- Start Time -->
+
+            <TextBlock
+                Grid.Row="0"
+                Grid.Column="0"
+                Text="Start Time" />
+
+            <TextBlock
+                Grid.Row="0"
+                Grid.Column="2"
+                Text="{Binding StartTime, Mode=OneWay, StringFormat=d}" />
+
+            <!-- End Time -->
+
+            <TextBlock
+                Grid.Row="1"
+                Grid.Column="0"
+                Text="End Time"
+                Margin="0 10 0 0" />
+
+            <TextBlock
+                Grid.Row="1"
+                Grid.Column="2"
+                Margin="0 10 0 0"
+                Text="{Binding EndTime, Mode=OneWay, StringFormat=d}" />
+
+            <!-- State -->
+
+            <TextBlock
+                Grid.Row="2"
+                Grid.Column="0"
+                Margin="0 10 0 0"
+                Text="State" />
+
+            <customControls:SprintStateControl
+                Grid.Row="2"
+                Grid.Column="2"
+                Margin="0 10 0 0"
+                Value="{Binding SprintState, Mode=OneWay}" />
+
+            <!-- Work Days -->
+
+            <StackPanel
+                Grid.Row="3"
+                Grid.Column="0"
+                Margin="0 10 0 0"
+                Orientation="Horizontal">
+
+                <TextBlock
+                    Text="Work Days" />
+
+                <customControls:InfoPoint
+                    Margin="5 0 0 0">
+
+                    <customControls:InfoPoint.InfoContent>
+                        <customControls:ParagraphsBlock>
+
+                            <DockPanel>
+
+                                <customControls:GenericIcon
+                                    DockPanel.Dock="Left"
+                                    Style="{StaticResource InfoIconStyle}"
+                                    Width="12"
+                                    Height="12"
+                                    Margin="0 0 10 0" />
+
+                                <TextBlock
+                                    Text="Work Days"
+                                    FontSize="15" />
+
+                            </DockPanel>
 
-            <customControls:LabeledContent
-                Label="Start Time"
-                Content="{Binding StartTime}" />
-
-            <customControls:LabeledContent
-                Label="End Time"
-                Content="{Binding EndTime}" />
-
-            <customControls:LabeledContent
-                Label="State"
-                Margin="0 8 0 0">
-
-                <customControls:SprintStateControl Value="{Binding SprintState, Mode=OneWay}" />
-
-            </customControls:LabeledContent>
-
-            <customControls:LabeledContent
-                Label="Work Days"
-                Margin="0 8 0 0">
-
-                <customControls:LabeledContent.InfoContent>
-                    <customControls:ParagraphsBlock>
+                            <TextBlock
+                                Text="All sprint days that are not week-ends or official holidays."
+                                FontSize="13" />
 
-                        <DockPanel>
+                        </customControls:ParagraphsBlock>
+                    </customControls:InfoPoint.InfoContent>
 
-                            <customControls:GenericIcon
-                                DockPanel.Dock="Left"
-                                Style="{StaticResource InfoIconStyle}"
-                                Width="12"
-                                Height="12"
-                                Margin="0 0 10 0" />
+                </customControls:InfoPoint>
 
-                            <TextBlock
-                                Text="Work Days"
-                                FontSize="15" />
+            </StackPanel>
 
-                        </DockPanel>
+            <TextBlock
+                Grid.Row="3"
+                Grid.Column="2"
+                Margin="0 10 0 0"
+                Text="{Binding WorkDays, StringFormat={}{0} days}" />
 
-                        <TextBlock
-                            Text="All sprint days that are not week-ends or official holidays."
-                            FontSize="13" />
+            <!-- Total Work Hours -->
 
-                    </customControls:ParagraphsBlock>
-                </customControls:LabeledContent.InfoContent>
+            <StackPanel
+                Grid.Row="4"
+                Grid.Column="0"
+                Margin="0 10 0 0"
+                Orientation="Horizontal">
 
-                <TextBlock Text="{Binding WorkDays, StringFormat={}{0} days}" />
+                <TextBlock
+                    Text="Total Work Hours" />
 
-            </customControls:LabeledContent>
+                <customControls:InfoPoint
+                    Margin="5 0 0 0">
 
-            <customControls:LabeledContent
-                Label="Total Work Hours"
-                Margin="0 8 0 0"
-                Content="{Binding TotalWorkHours}">
+                    <customControls:InfoPoint.InfoContent>
+                        <customControls:ParagraphsBlock>
 
-                <customControls:LabeledContent.InfoContent>
-                    <customControls:ParagraphsBlock>
+                            <DockPanel>
 
-                        <DockPanel>
+                                <customControls:GenericIcon
+                                    DockPanel.Dock="Left"
+                                    Style="{StaticResource InfoIconStyle}"
+                                    Width="12"
+                                    Height="12"
+                                    Margin="0 0 10 0" />
 
-                            <customControls:GenericIcon
-                                DockPanel.Dock="Left"
-                                Style="{StaticResource InfoIconStyle}"
-                                Width="12"
-                                Height="12"
-                                Margin="0 0 10 0" />
+                                <TextBlock
+                                    Text="Total Work Hours"
+                                    FontSize="15" />
 
-                            <TextBlock
-                                Text="Total Work Hours"
-                                FontSize="15" />
+                            </DockPanel>
 
-                        </DockPanel>
+                            <customControls:ParagraphsBlock FontSize="13">
+                                <TextBlock Text="The total number of working hours from all the team members." />
+                                <TextBlock Text="The vacations and official holidays are excluded." />
+                            </customControls:ParagraphsBlock>
 
-                        <customControls:ParagraphsBlock FontSize="13">
-                            <TextBlock Text="The total number of working hours from all the team members." />
-                            <TextBlock Text="The vacations and official holidays are excluded." />
                         </customControls:ParagraphsBlock>
+                    </customControls:InfoPoint.InfoContent>
+
+                </customControls:InfoPoint>
 
-                    </customControls:ParagraphsBlock>
-                </customControls:LabeledContent.InfoContent>
+            </StackPanel>
 
-            </customControls:LabeledContent>
+            <TextBlock
+                Grid.Row="4"
+                Grid.Column="2"
+                Margin="0 10 0 0"
+                Text="{Binding TotalWorkHours}" />
 
-        </StackPanel>
+        </Grid>
 
     </customControls:PanelWithTitle>
 
diff --git a/sources/VeloCity.Wpf.Presentation/SprintsArea/SprintOverview/GeneralInfoViewModel.cs b/sources/VeloCity.Wpf.Presentation/SprintsArea/SprintOverview/GeneralInfoViewModel.cs
index dbd2409..39c4679 100644
--- a/sources/VeloCity.Wpf.Presentation/SprintsArea/SprintOverview/GeneralInfoViewModel.cs
+++ b/sources/VeloCity.Wpf.Presentation/SprintsArea/SprintOverview/GeneralInfoViewModel.cs
@@ -39,7 +39,7 @@ public class GeneralInfoViewModel : ViewModelBase
     public DateTime? StartTime
     {
         get => startTime;
-        set
+        private set
         {
             if (value.Equals(startTime)) return;
             startTime = value;
@@ -50,7 +50,7 @@ public DateTime? StartTime
     public DateTime? EndTime
     {
         get => endTime;
-        set
+        private set
         {
             if (value.Equals(endTime)) return;
             endTime = value;