diff --git a/ENI2/Controls/MaerskListControl.xaml b/ENI2/Controls/MaerskListControl.xaml
index dba0dac2..b2bde931 100644
--- a/ENI2/Controls/MaerskListControl.xaml
+++ b/ENI2/Controls/MaerskListControl.xaml
@@ -27,8 +27,8 @@
             <StackPanel Orientation="Horizontal">
                 <Label Content="Calendar week" />
                 <Label Content="Type" />
-                <Button x:Name="buttonExcelExport" Margin="2" Content="Export Excel" Width="100" />
-                <Button x:Name="buttonSaveChanges" Margin="2" Content="Save changes" Width="100" IsEnabled="False" />
+                <Button x:Name="buttonImport" Margin="2" Content="Import" Width="70" />
+                <Button x:Name="buttonExport" Margin="2" Content="Export" Width="70" />
             </StackPanel>
             <local:ENIDataGrid Grid.Row="1" Margin="2,8,2,2" x:Name="dataGridPOCores" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
                                              SelectionMode="Single" AutoGenerateColumns="False" CellEditEnding="dataGridPOCores_CellEditEnding" CanUserAddRows="False">
diff --git a/ENI2/Controls/MaerskListControl.xaml.cs b/ENI2/Controls/MaerskListControl.xaml.cs
index 008e6d02..45062c46 100644
--- a/ENI2/Controls/MaerskListControl.xaml.cs
+++ b/ENI2/Controls/MaerskListControl.xaml.cs
@@ -44,13 +44,9 @@ namespace ENI2.Controls
 
         private void POList_Loaded(object sender, RoutedEventArgs e)
         {
-            
+
         }
 
-        
-
-        
-
         private void dataGridPOCores_CellEditEnding(object sender, DataGridCellEditEndingEventArgs e)
         {
             if (e.EditAction == DataGridEditAction.Commit)
@@ -66,7 +62,7 @@ namespace ENI2.Controls
                     }
                     else
                     {
-                        buttonSaveChanges.IsEnabled = true;
+                        // buttonSaveChanges.IsEnabled = true;
                         MessageCore editedCore = this.filteredResult[e.Row.GetIndex()];
                         editedCore.IsDirty = true;
                     }
@@ -86,7 +82,7 @@ namespace ENI2.Controls
                     {
                         editedCore.SetFlag(true, coreFlag);
                     }
-                    buttonSaveChanges.IsEnabled = true;
+                    // buttonSaveChanges.IsEnabled = true;
                     editedCore.IsDirty = true;
                 }
                 if(e.Column == gridColumnATA)
@@ -96,7 +92,7 @@ namespace ENI2.Controls
                     {
                         MessageCore editedCore = this.filteredResult[e.Row.GetIndex()];
                         editedCore.ATA = DateTime.SpecifyKind(localATA, DateTimeKind.Local).ToUniversalTime();
-                        buttonSaveChanges.IsEnabled = true;
+                        // buttonSaveChanges.IsEnabled = true;
                         editedCore.IsDirty = true;
                     } 
                     else
@@ -152,7 +148,7 @@ namespace ENI2.Controls
                             {
                                 messageCore.POATA = messageCore.ATA;
                                 messageCore.IsDirty = true;
-                                this.buttonSaveChanges.IsEnabled = true;
+                                // this.buttonSaveChanges.IsEnabled = true;
                             }
                         }
                     }
@@ -170,6 +166,14 @@ namespace ENI2.Controls
             this.dataGridPOCores.ItemsSource = this.filteredResult;
         }
 
+        private List<MessageCore> GetNextNDayCoresFromList(List<MessageCore> cores, int numDays = 3)
+        {
+            List<MessageCore> result = new List<MessageCore>();
+
+            result.AddRange(cores.FindAll(x => (x.ETADisplay.Value - DateTime.Now).TotalHours < (numDays * 24)));
+
+            return result;
+        }
 
         #endregion