diff --git a/DistrictEnergy/Properties/AssemblyInfo.cs b/DistrictEnergy/Properties/AssemblyInfo.cs
index 563a144..fbdb763 100644
--- a/DistrictEnergy/Properties/AssemblyInfo.cs
+++ b/DistrictEnergy/Properties/AssemblyInfo.cs
@@ -24,7 +24,7 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyProduct("DistricEnergyPlugIn")]
-[assembly: AssemblyVersion("2.0.2.*")]
+[assembly: AssemblyVersion("2.0.3.*")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
diff --git a/DistrictEnergy/ViewModels/LoadsViewModel.cs b/DistrictEnergy/ViewModels/LoadsViewModel.cs
index be4db27..94d791a 100644
--- a/DistrictEnergy/ViewModels/LoadsViewModel.cs
+++ b/DistrictEnergy/ViewModels/LoadsViewModel.cs
@@ -1,12 +1,16 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using System.Runtime.CompilerServices;
+using System.Windows;
+using Deedle;
 using DistrictEnergy.Annotations;
 using DistrictEnergy.Helpers;
 using DistrictEnergy.Networks.ThermalPlants;
 using LiveCharts;
 using LiveCharts.Defaults;
+using LiveCharts.Dtos;
 using LiveCharts.Geared;
 using Umi.RhinoServices.Context;
 using Umi.RhinoServices.UmiEvents;
@@ -22,6 +26,8 @@ internal class LoadsViewModel : INotifyPropertyChanged
         private double _to;
         private Func<double, string> _timeFormatter;
         private bool _isStorageVisible;
+        private double _fixedTo;
+        private double _fixedFrom;
 
         public LoadsViewModel()
         {
@@ -53,7 +59,31 @@ public LoadsViewModel()
             };
 
             From = new DateTime(2018, 01, 01, 0, 0, 0).Ticks;
+            FixedFrom = From;
             To = new DateTime(2018, 01, 01, 0, 0, 0).AddHours(8760).Ticks;
+            FixedTo = To;
+        }
+
+        public double FixedTo
+        {
+            get => _fixedTo;
+            set
+            {
+                if (value.Equals(_fixedTo)) return;
+                _fixedTo = value;
+                OnPropertyChanged();
+            }
+        }
+
+        public double FixedFrom
+        {
+            get => _fixedFrom;
+            set
+            {
+                if (value.Equals(_fixedFrom)) return;
+                _fixedFrom = value;
+                OnPropertyChanged();
+            }
         }
 
         public bool IsStorageVisible
@@ -157,7 +187,7 @@ private void UpdateLoadsChart(object sender, EventArgs e)
         {
             var args = (DHRunLPModel.SimulationCompleted) e;
             var Total = new double[args.TimeSteps];
-            var lineSmoothness = 0.5;
+            var lineSmoothness = 0.1;
             SeriesCollection.Clear();
             DemandLineCollection.Clear();
 
@@ -180,11 +210,13 @@ private void UpdateLoadsChart(object sender, EventArgs e)
                     SeriesCollection.Add(series);
                     DemandLineCollection.Add(new GLineSeries
                     {
-                        Values = demand.Input.ToDateTimePoint().Split(12)
+                        Values = demand.Input.ToDateTimePoint().Split(plot_duration)
                             .Select(v => new DateTimePoint(v.First().DateTime, v.Sum())).AsGearedValues(),
                         Title = demand.Name,
                         LineSmoothness = lineSmoothness,
-                        Stroke = demand.Fill
+                        Stroke = demand.Fill,
+                        PointGeometry = null,
+                        StrokeThickness = 0.5,
                     });
                 }
 
@@ -233,7 +265,7 @@ private void UpdateLoadsChart(object sender, EventArgs e)
                             .Select(v => new DateTimePoint(v.First().DateTime, v.Sum())).AsGearedValues(),
                         Title = storage.Name,
                         Fill = storage.Fill,
-                        LineSmoothness = lineSmoothness,
+                        LineSmoothness = 0.5,
                         AreaLimit = 0,
                         LabelPoint = KWhLabelPointFormatter,
                     });
@@ -262,7 +294,6 @@ private void UpdateLoadsChart(object sender, EventArgs e)
                         AreaLimit = 0,
                         LabelPoint = KWhLabelPointFormatter,
                     });
-                    IsStorageVisible = true;
                 }
             }
         }
diff --git a/DistrictEnergy/ViewModels/PlantSettingsViewModel.cs b/DistrictEnergy/ViewModels/PlantSettingsViewModel.cs
index d78f60b..db30332 100644
--- a/DistrictEnergy/ViewModels/PlantSettingsViewModel.cs
+++ b/DistrictEnergy/ViewModels/PlantSettingsViewModel.cs
@@ -31,7 +31,6 @@ public class PlantSettingsViewModel : INotifyPropertyChanged
                 typeof(PhotovoltaicArray),
                 typeof(SolarThermalCollector),
                 typeof(WindTurbine),
-                typeof(PipeNetwork),
                 typeof(GridElectricity),
                 typeof(GridGas),
                 typeof(CustomEnergySupplyModule)
@@ -99,11 +98,6 @@ private void LoadSettings(UmiContext context)
                 {
                     DistrictControl.Instance.ListOfPlantSettings.Add(new GridGas());
                 }
-                if (!DistrictControl.Instance.ListOfPlantSettings.OfType<PipeNetwork>().Any())
-                {
-                    DistrictControl.Instance.ListOfDistrictLoads.Add(new PipeNetwork(LoadTypes.Cooling, "Cooling Losses"));
-                    DistrictControl.Instance.ListOfDistrictLoads.Add(new PipeNetwork(LoadTypes.Heating, "Heating Losses"));
-                }
             }
 
             OnPropertyChanged(string.Empty);
diff --git a/DistrictEnergy/Views/PlantSettings/ChilledWaterView.xaml b/DistrictEnergy/Views/PlantSettings/ChilledWaterView.xaml
index 91e57b4..0bbbcda 100644
--- a/DistrictEnergy/Views/PlantSettings/ChilledWaterView.xaml
+++ b/DistrictEnergy/Views/PlantSettings/ChilledWaterView.xaml
@@ -26,7 +26,7 @@
                 <ResourceDictionary
                     Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
                 <ResourceDictionary
-                    Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.DeepPurple.xaml" />
+                    Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/materialdesigncolor.blue.xaml" />
                 <ResourceDictionary
                     Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Lime.xaml" />
             </ResourceDictionary.MergedDictionaries>
@@ -43,7 +43,7 @@
                             <ColumnDefinition />
                         </Grid.ColumnDefinitions>
                         <materialDesign:PackIcon Grid.Column="0"
-                                                 Kind="InfoOutline"
+                                                 Kind="Snowflake"
                                                  Height="32"
                                                  Width="32"
                                                  VerticalAlignment="Center" />
diff --git a/DistrictEnergy/Views/PlantSettings/ElectricGenerationView.xaml b/DistrictEnergy/Views/PlantSettings/ElectricGenerationView.xaml
index f862082..d04ca0e 100644
--- a/DistrictEnergy/Views/PlantSettings/ElectricGenerationView.xaml
+++ b/DistrictEnergy/Views/PlantSettings/ElectricGenerationView.xaml
@@ -24,34 +24,11 @@
                 <ResourceDictionary
                     Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
                 <ResourceDictionary
-                    Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.DeepPurple.xaml" />
+                    Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/materialdesigncolor.yellow.xaml" />
                 <ResourceDictionary
                     Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Lime.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
-        <!--<Style x:Key="PlantComponentHeader" TargetType="{x:Type TextBlock}">
-            <Setter Property="TextWrapping" Value="NoWrap" />
-            <Setter Property="TextTrimming" Value="None" />
-            <Setter Property="Margin" Value="5, 5" />
-            <Setter Property="FontSize" Value="14" />
-            <Setter Property="Foreground" Value="#404040" />
-        </Style>
-        <Style x:Key="StackPanelStyle" TargetType="StackPanel">
-            <Setter Property="HorizontalAlignment" Value="Stretch" />
-            <Setter Property="VerticalAlignment" Value="Top" />
-            <Setter Property="Width" Value="Auto" />
-            <Setter Property="Margin" Value="5,0,5,5" />
-            <Setter Property="Background" Value="White" />
-        </Style>
-        <Style x:Key="TextBoxInError" TargetType="{x:Type TextBox}">
-            <Style.Triggers>
-                <Trigger Property="Validation.HasError" Value="true">
-                    <Setter Property="ToolTip"
-                            Value="{Binding RelativeSource={x:Static RelativeSource.Self},
-                              Path=(Validation.Errors)[0].ErrorContent}" />
-                </Trigger>
-            </Style.Triggers>
-        </Style>-->
     </UserControl.Resources>
     <Grid x:Name="ElectricGenGroup">
         <GroupBox Margin="4" Style="{DynamicResource MaterialDesignCardGroupBox}"
@@ -64,7 +41,7 @@
                             <ColumnDefinition />
                         </Grid.ColumnDefinitions>
                         <materialDesign:PackIcon Grid.Column="0"
-                                                 Kind="InfoOutline"
+                                                 Kind="Flash"
                                                  Height="32"
                                                  Width="32"
                                                  VerticalAlignment="Center" />
diff --git a/DistrictEnergy/Views/PlantSettings/HotWaterView.xaml b/DistrictEnergy/Views/PlantSettings/HotWaterView.xaml
index c44b753..5ef03ed 100644
--- a/DistrictEnergy/Views/PlantSettings/HotWaterView.xaml
+++ b/DistrictEnergy/Views/PlantSettings/HotWaterView.xaml
@@ -25,25 +25,11 @@
                 <ResourceDictionary
                     Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
                 <ResourceDictionary
-                    Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.DeepPurple.xaml" />
+                    Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/materialdesigncolor.red.xaml" />
                 <ResourceDictionary
                     Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Lime.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
-        <!--<Style x:Key="PlantComponentHeader" TargetType="{x:Type TextBlock}">
-            <Setter Property="TextWrapping" Value="NoWrap" />
-            <Setter Property="TextTrimming" Value="None" />
-            <Setter Property="Margin" Value="5, 5" />
-            <Setter Property="FontSize" Value="14" />
-            <Setter Property="Foreground" Value="#404040" />
-        </Style>
-        <Style x:Key="StackPanelStyle" TargetType="StackPanel">
-            <Setter Property="HorizontalAlignment" Value="Stretch" />
-            <Setter Property="VerticalAlignment" Value="Top" />
-            <Setter Property="Width" Value="Auto" />
-            <Setter Property="Margin" Value="5,0,5,5" />
-            <Setter Property="Background" Value="White" />
-        </Style>-->
     </UserControl.Resources>
     <Grid x:Name="HotWaterGroup">
         <GroupBox Margin="4" Style="{DynamicResource MaterialDesignCardGroupBox}"
@@ -56,7 +42,7 @@
                             <ColumnDefinition />
                         </Grid.ColumnDefinitions>
                         <materialDesign:PackIcon Grid.Column="0"
-                                                 Kind="InfoOutline"
+                                                 Kind="Fire"
                                                  Height="32"
                                                  Width="32"
                                                  VerticalAlignment="Center" />
diff --git a/DistrictEnergy/Views/PlantSettings/NetworkView.xaml b/DistrictEnergy/Views/PlantSettings/NetworkView.xaml
index d602732..28d1a89 100644
--- a/DistrictEnergy/Views/PlantSettings/NetworkView.xaml
+++ b/DistrictEnergy/Views/PlantSettings/NetworkView.xaml
@@ -5,75 +5,121 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:local="clr-namespace:DistrictEnergy.Views.PlantSettings"
              xmlns:viewModels="clr-namespace:DistrictEnergy.ViewModels"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d"
-             d:DesignHeight="87.984" d:DesignWidth="617.578"
+             d:DesignHeight="253.984" d:DesignWidth="617.578"
+             TextElement.Foreground="{DynamicResource MaterialDesignBody}"
+             TextElement.FontWeight="Regular"
+             TextElement.FontSize="13"
+             TextOptions.TextFormattingMode="Ideal"
+             TextOptions.TextRenderingMode="Auto"
+             Background="{DynamicResource MaterialDesignPaper}"
+             FontFamily="{DynamicResource MaterialDesignFont}"
              d:DataContext="{d:DesignInstance viewModels:NetworkViewModel}">
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary
+                    Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/materialdesigntheme.light.xaml" />
+                <ResourceDictionary
+                    Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
+                <ResourceDictionary
+                    Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/materialdesigncolor.grey.xaml" />
+                <ResourceDictionary
+                    Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Lime.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
     <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="Auto" />
-        </Grid.ColumnDefinitions>
-        <StackPanel Grid.ColumnSpan="2" VerticalAlignment="Center" Margin="5,0">
-            <StackPanel.DataContext>
-                <viewModels:PlanningSettingsViewModel />
-            </StackPanel.DataContext>
-            <Slider Minimum="0" Maximum="11" IsSnapToTickEnabled="True"
-                    Ticks="0,1,2,3,4,5,6,7,8,9,10,11"
-                    VerticalAlignment="Center" Value="{Binding TimeSteps}" />
-            <Grid>
-                <TextBlock HorizontalAlignment="Left">Fast</TextBlock>
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                    <TextBlock Text="{Binding DisplayTimeSteps}" />
-                    <TextBlock Text=" Simulation TimeSteps" />
+        <GroupBox Margin="4" Style="{DynamicResource MaterialDesignCardGroupBox}"
+                  HorizontalAlignment="Stretch">
+            <GroupBox.HeaderTemplate>
+                <DataTemplate>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <materialDesign:PackIcon Grid.Column="0"
+                                                 Kind="Cog"
+                                                 Height="32"
+                                                 Width="32"
+                                                 VerticalAlignment="Center" />
+                        <TextBlock Grid.Column="1" Margin="8,0,0,0"
+                                   VerticalAlignment="Center"
+                                   Style="{DynamicResource MaterialDesignSubtitle1TextBlock}"
+                                   Text="SIMULATION SETTINGS" />
+                    </Grid>
+                </DataTemplate>
+            </GroupBox.HeaderTemplate>
+            <Grid VerticalAlignment="Top">
+                <Grid.RowDefinitions>
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <StackPanel Grid.ColumnSpan="2" VerticalAlignment="Center" Margin="5,0,5,15">
+                    <StackPanel.DataContext>
+                        <viewModels:PlanningSettingsViewModel />
+                    </StackPanel.DataContext>
+                    <Slider Minimum="0" Maximum="11" IsSnapToTickEnabled="True"
+                            Ticks="0,1,2,3,4,5,6,7,8,9,10,11"
+                            VerticalAlignment="Center" Value="{Binding TimeSteps}" />
+                    <Grid>
+                        <TextBlock HorizontalAlignment="Left">Fast</TextBlock>
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                            <TextBlock Text="{Binding DisplayTimeSteps}" />
+                            <TextBlock Text=" Simulation TimeSteps" />
+                        </StackPanel>
+                        <TextBlock HorizontalAlignment="Right">Accurate</TextBlock>
+                    </Grid>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Grid.Row="1">
+                    <Label Content="Account for network losses?"
+                           ToolTip="Average annual ratio of useful heating delivered to electricity consumed"
+                           Margin="0,2,3,2" />
+                    <CheckBox IsChecked="{Binding UseDistrictLosses, Mode=TwoWay}"
+                              VerticalAlignment="Center" />
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="1">
+                    <Label Content="Hot"
+                           ToolTip="Relative distribution heat loss" Margin="0,2,4,2" />
+                    <TextBox
+                        Text="{Binding RelDistHeatLoss, BindsDirectlyToSource=True, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                        IsEnabled="{Binding UseDistrictLosses, Mode=OneWay}" Margin="0,0,5,0"
+                        VerticalContentAlignment="Center" MinWidth="20" />
+                    <Label Content="Cold"
+                           ToolTip="Average annual ratio of useful heating delivered to electricity consumed"
+                           Margin="0,2,4,2" />
+                    <TextBox
+                        Text="{Binding RelDistCoolLoss, BindsDirectlyToSource=True, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                        IsEnabled="{Binding UseDistrictLosses, Mode=OneWay}" Margin="0,0,10,0"
+                        VerticalContentAlignment="Center" MinWidth="20" />
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Grid.Row="2">
+                    <StackPanel.DataContext>
+                        <viewModels:PlanningSettingsViewModel />
+                    </StackPanel.DataContext>
+                    <Label Content="Annuity"
+                           ToolTip="Annuity Payment Factor"
+                           Margin="0,2,3,2" />
+                    <TextBox
+                        Text="{Binding Rate, BindsDirectlyToSource=True, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                        Margin="0,0,10,0" ToolTip="Rate per period"
+                        VerticalContentAlignment="Center" MinWidth="20" />
+                    <TextBox
+                        Text="{Binding Periods, BindsDirectlyToSource=True, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                        Margin="0,0,10,0" ToolTip="Number of periods"
+                        VerticalContentAlignment="Center" MinWidth="20" />
+                    <TextBlock Text="{Binding AnnuityFactor, StringFormat=N4}" VerticalAlignment="Center"
+                               Foreground="#FF969696"
+                               ToolTip="Computed Annuity Payment Factor" />
                 </StackPanel>
-                <TextBlock HorizontalAlignment="Right">Accurate</TextBlock>
             </Grid>
-        </StackPanel>
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Grid.Row="1">
-            <Label Content="Account for network losses?"
-                   ToolTip="Average annual ratio of useful heating delivered to electricity consumed"
-                   Margin="0,2,3,2" />
-            <CheckBox IsChecked="{Binding UseDistrictLosses, Mode=TwoWay}"
-                      VerticalAlignment="Center" />
-        </StackPanel>
-        <StackPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="1">
-            <Label Content="Hot"
-                   ToolTip="Relative distribution heat loss" Margin="0,2,4,2" />
-            <TextBox
-                Text="{Binding RelDistHeatLoss, BindsDirectlyToSource=True, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                IsEnabled="{Binding UseDistrictLosses, Mode=OneWay}" Margin="0,0,5,0"
-                VerticalContentAlignment="Center" />
-            <Label Content="Cold"
-                   ToolTip="Average annual ratio of useful heating delivered to electricity consumed"
-                   Margin="0,2,4,2" />
-            <TextBox
-                Text="{Binding RelDistCoolLoss, BindsDirectlyToSource=True, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                IsEnabled="{Binding UseDistrictLosses, Mode=OneWay}" Margin="0,0,10,0"
-                VerticalContentAlignment="Center" />
-        </StackPanel>
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Grid.Row="2">
-            <StackPanel.DataContext>
-                <viewModels:PlanningSettingsViewModel />
-            </StackPanel.DataContext>
-            <Label Content="Annuity"
-                   ToolTip="Annuity Payment Factor"
-                   Margin="0,2,3,2" />
-            <TextBox
-                Text="{Binding Rate, BindsDirectlyToSource=True, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                Margin="0,0,10,0" ToolTip="Rate per period"
-                VerticalContentAlignment="Center" />
-            <TextBox
-                Text="{Binding Periods, BindsDirectlyToSource=True, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                Margin="0,0,10,0" ToolTip="Number of periods"
-                VerticalContentAlignment="Center" />
-            <TextBlock Text="{Binding AnnuityFactor, StringFormat=N4}" VerticalAlignment="Center"
-                       Foreground="#FF969696"
-                       ToolTip="Computed Annuity Payment Factor" />
-        </StackPanel>
+        </GroupBox>
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/DistrictEnergy/Views/ResultViews/Loads.xaml b/DistrictEnergy/Views/ResultViews/Loads.xaml
index f2da901..31de535 100644
--- a/DistrictEnergy/Views/ResultViews/Loads.xaml
+++ b/DistrictEnergy/Views/ResultViews/Loads.xaml
@@ -6,12 +6,13 @@
              xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
              xmlns:geared="clr-namespace:LiveCharts.Geared;assembly=LiveCharts.Geared"
              xmlns:viewModels="clr-namespace:DistrictEnergy.ViewModels"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d"
              d:DesignHeight="300" d:DesignWidth="300" d:DataContext="{d:DesignInstance viewModels:LoadsViewModel}">
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="2*"/>
-            <RowDefinition >
+            <RowDefinition Height="2*" />
+            <RowDefinition>
                 <RowDefinition.Style>
                     <Style TargetType="{x:Type RowDefinition}">
                         <Setter Property="Height" Value="0.5*" />
@@ -59,33 +60,52 @@
                             ScrollMode="X"
                             ScrollHorizontalFrom="{Binding From, Mode=TwoWay}"
                             ScrollHorizontalTo="{Binding To, Mode=TwoWay}"
-                            ScrollBarFill="#25303030"
+                            ScrollBarFill="#134682b4"
                             DataTooltip="{x:Null}"
                             Hoverable="False"
-                            Series="{Binding StorageSeriesCollection}">
+                            Series="{Binding StorageSeriesCollection}" Margin="13,0,0,0">
             <lvc:CartesianChart.AxisX>
-                <lvc:Axis IsMerged="True"
-                          LabelFormatter="{Binding TimeFormatter, Mode=OneTime}"/>
+                <lvc:Axis IsMerged="True" ShowLabels="True"
+                          LabelFormatter="{Binding TimeFormatter, Mode=OneTime}" />
             </lvc:CartesianChart.AxisX>
             <lvc:CartesianChart.AxisY>
-                <lvc:Axis Title="Storage Level" ShowLabels="False" IsMerged="True"/>
+                <lvc:Axis ShowLabels="False" IsMerged="True" />
             </lvc:CartesianChart.AxisY>
         </lvc:CartesianChart>
+        <TextBlock FontSize="10" HorizontalAlignment="Left" VerticalAlignment="Top" Grid.Row="1" Margin="13,0,0,0"
+                   Foreground="#4682b4">Storage Level</TextBlock>
         <lvc:CartesianChart Grid.Row="2" DisableAnimations="True"
                             ScrollMode="X"
                             ScrollHorizontalFrom="{Binding From, Mode=TwoWay}"
                             ScrollHorizontalTo="{Binding To, Mode=TwoWay}"
-                            ScrollBarFill="#25303030"
+                            ScrollBarFill="#134682b4"
                             DataTooltip="{x:Null}"
                             Hoverable="False"
-                            Series="{Binding DemandLineCollection}">
+                            Series="{Binding DemandLineCollection}" Margin="13,0,0,0">
             <lvc:CartesianChart.AxisX>
-                <lvc:Axis IsMerged="True"
-                          LabelFormatter="{Binding TimeFormatter, Mode=OneTime}"/>
+                <lvc:Axis IsMerged="True" MinValue="{Binding FixedFrom}" MaxValue="{Binding FixedTo}"
+                          LabelFormatter="{Binding TimeFormatter, Mode=OneTime}" />
             </lvc:CartesianChart.AxisX>
             <lvc:CartesianChart.AxisY>
-                <lvc:Axis ShowLabels="False" Title="" IsMerged="True"/>
+                <lvc:Axis ShowLabels="False" Title="" IsMerged="True" />
             </lvc:CartesianChart.AxisY>
         </lvc:CartesianChart>
+        <Button x:Name="ResetButton" Grid.Row="2" HorizontalAlignment="Right" VerticalAlignment="Top"
+                BorderBrush="{x:Null}" Background="{x:Null}" Click="ResetClick" Visibility="Hidden">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <materialDesign:PackIcon Kind="restore" Foreground="#4682b4" VerticalAlignment="Bottom" Width="12"
+                                         Height="12" Margin="0,0,1,0" />
+                <TextBlock Grid.Column="1" Foreground="#4682b4" Height="16">reset</TextBlock>
+            </Grid>
+        </Button>
+        <TextBlock Grid.Row="2" Foreground="DimGray" HorizontalAlignment="Right" VerticalAlignment="Top" FontSize="10"
+                   Padding="10" x:Name="ScrollTip">
+            Scroll To Zoom
+        </TextBlock>
+        <StackPanel Grid.Row="2" x:Name="LoadList" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="13,0,0,0" />
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/DistrictEnergy/Views/ResultViews/Loads.xaml.cs b/DistrictEnergy/Views/ResultViews/Loads.xaml.cs
index 010275a..09d6c43 100644
--- a/DistrictEnergy/Views/ResultViews/Loads.xaml.cs
+++ b/DistrictEnergy/Views/ResultViews/Loads.xaml.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Linq;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using DistrictEnergy.ViewModels;
@@ -19,6 +21,33 @@ public Loads()
             InitializeComponent();
 
             DataContext = new LoadsViewModel();
+
+            DHRunLPModel.Instance.Completion += Window_Loaded;
+        }
+
+        private void Window_Loaded(object sender, EventArgs e)
+        {
+            GenerateLoadList();
+        }
+
+        /// <summary>
+        /// Generates list of demands in the annual view.
+        /// </summary>
+        private void GenerateLoadList()
+        {
+            LoadList.Children.Clear();
+            foreach (var load in DistrictControl.Instance.ListOfDistrictLoads)
+            {
+                TextBlock name = new TextBlock();
+                name.Text = load.Name;
+                name.Foreground = load.Fill;
+                name.FontSize = 10;
+
+                if (load.Input.Sum() > 0)
+                {
+                    LoadList.Children.Add(name);
+                }
+            }
         }
 
         private void CartesianChart_MouseMove(object sender, MouseEventArgs e)
@@ -54,7 +83,8 @@ private void CartesianChart_MouseMove(object sender, MouseEventArgs e)
         private void Axis_OnRangeChanged(RangeChangedEventArgs eventargs)
         {
             var vm = (LoadsViewModel)DataContext;
-
+            ResetButton.Visibility = Visibility.Visible;
+            ScrollTip.Visibility = Visibility.Hidden;
             var currentRange = eventargs.Range;
 
             if (currentRange < TimeSpan.TicksPerDay * 2)
@@ -78,10 +108,18 @@ private void Axis_OnRangeChanged(RangeChangedEventArgs eventargs)
             vm.TimeFormatter = x => new DateTime((long)x).ToString("yyyy");
         }
 
-        public void Dispose()
+        /// <summary>
+        /// Clicking the reset button, resets the from and to properties of the scrollbar
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ResetClick(object sender, System.Windows.RoutedEventArgs e)
         {
             var vm = (LoadsViewModel)DataContext;
-            //vm.SeriesCollection.Dispose();
+            vm.From = new DateTime(2018, 01, 01, 0, 0, 0).Ticks;
+            vm.To = new DateTime(2018, 01, 01, 0, 0, 0).AddHours(8760).Ticks;
+            ScrollTip.Visibility = Visibility.Visible;
+            ResetButton.Visibility = Visibility.Hidden;
         }
     }
 }
\ No newline at end of file
diff --git a/README.md b/README.md
index eb4cb1a..33aaa0c 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,4 @@
 # DistrictEnergy
 An umi PlugIn for the study of District Energy Systems
+
+[![](https://img.shields.io/github/release/MITSustainableDesignLab/DistrictEnergyPlugIn.svg?)](https://github.com/MITSustainableDesignLab/DistrictEnergyPlugIn/releases/latest)
diff --git a/SetupProject/DistrictPlugInInstaller.wixproj b/SetupProject/DistrictPlugInInstaller.wixproj
index 2e77824..7cc3de0 100644
--- a/SetupProject/DistrictPlugInInstaller.wixproj
+++ b/SetupProject/DistrictPlugInInstaller.wixproj
@@ -6,7 +6,7 @@
     <ProductVersion>3.10</ProductVersion>
     <ProjectGuid>2a10a76b-558f-424d-965b-d2c84703cee0</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>DistrictPluginInstaller-4.433-2020-dev-2.0.2</OutputName>
+    <OutputName>DistrictPluginInstaller-4.433-2020-dev-2.0.3</OutputName>
     <OutputType>Package</OutputType>
     <Name>DistrictPlugInInstaller</Name>
   </PropertyGroup>