diff --git a/TremAn3.Core/TremAn3.Core.csproj b/TremAn3.Core/TremAn3.Core.csproj
index ec2a8e5..0627e8b 100644
--- a/TremAn3.Core/TremAn3.Core.csproj
+++ b/TremAn3.Core/TremAn3.Core.csproj
@@ -10,7 +10,12 @@
   </ItemGroup>
 
    <ItemGroup>
-     <PackageReference Include="MathNet.Numerics" Version="4.15.0" />
+     <PackageReference Include="MathNet.Numerics" Version="4.15.0" ExcludeAssets="All" />
      <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
    </ItemGroup>
+
+	<ItemGroup>
+    <!-- https://github.com/mathnet/mathnet-numerics/issues/579 -->
+		<Reference Include="MathNet.Numerics.Ref" HintPath="$(NuGetPackageRoot)mathnet.numerics\4.15.0\lib\netstandard1.3\MathNet.Numerics.dll" />
+	</ItemGroup>
 </Project>
diff --git a/TremAn3/Views/MainPage.xaml b/TremAn3/Views/MainPage.xaml
index d218d9b..5f03964 100644
--- a/TremAn3/Views/MainPage.xaml
+++ b/TremAn3/Views/MainPage.xaml
@@ -47,6 +47,7 @@
                     <VisualState.Setters>
                         <Setter Target="LandingGrid.Visibility" Value="Collapsed"/>
                         <Setter Target="MediaPlayback.Visibility" Value="Visible"/>
+                        <Setter Target="PastMeasurements.Visibility" Value="Visible"/>
                         <!--<Setter Target="GridMediPlaybackAndPastMeasurements" Value="Visible"/>-->
                         <Setter Target="MediaPlayback.DrawingRectangle.Visibility" Value="Visible"/>
                     </VisualState.Setters>
@@ -84,7 +85,7 @@
                 <RowDefinition Height="{x:Bind helpers:StaticConverters.HeightOfMeasurementsInMainPage(ViewModel.PastMeasurementsViewModel.IsPastMeasurementsOpen), Mode=OneWay}"/>
             </Grid.RowDefinitions>
             <views:MediaPlaybackUc x:Name="MediaPlayback" Visibility="Collapsed"/>
-            <views:PastMeasurementsUc Grid.Row="1"/>
+            <views:PastMeasurementsUc x:Name="PastMeasurements" Visibility="Collapsed" Grid.Row="1"/>
         </Grid>