diff --git a/lib/+artoa/+controller/+edit/+timeOfArrival/createSoundsourceColorsPanel.m b/lib/+artoa/+controller/+edit/+timeOfArrival/createSoundsourceColorsPanel.m
new file mode 100644
index 0000000000000000000000000000000000000000..a8b97a9583e42f241c3e349531079adc84cde976
--- /dev/null
+++ b/lib/+artoa/+controller/+edit/+timeOfArrival/createSoundsourceColorsPanel.m
@@ -0,0 +1,64 @@
+function [] = createSoundsourceColorsPanel()
+%CREATESOUNDSOURCECOLORSPANEL Summary of this function goes here
+%   Detailed explanation goes here
+
+
+global artoaGui artoaWorkspace;
+
+width = .14;
+
+artoaGui.editTimeOfArrival.frameControlsSoundSourceColors = uipanel( ...
+    'Parent', artoaGui.figures.editTimeOfArrival, ...
+    'Title', 'Soundsource colors', ...
+    'Units', 'normalized', ...
+    'BackgroundColor', 'white', ...
+    'Position', [.01 .3 width .6] ...
+);
+
+% add label and color for every sound source that is available
+spaceTopAndBottom = .05;
+leftItemOffset = 0;
+rightItemOffset = 0;
+
+artoaGui.editTimeOfArrival.labelSoundsourcesColors = struct();
+soundsources = artoaWorkspace.filteredSoundsources;
+fnames = fieldnames(soundsources);
+
+isLeftItem = true;
+
+for i = 1:length(fnames)
+    if isLeftItem
+        offset = leftItemOffset;
+        marginLeft = 0;
+        leftItemOffset = leftItemOffset + 0.04;
+        isLeftItem = false;
+    else
+        offset = rightItemOffset;
+        marginLeft = .5;
+        rightItemOffset = rightItemOffset + 0.04;
+        isLeftItem = true;
+    end
+    artoaGui.editTimeOfArrival.labelSoundsourcesColors.(fnames{i}) = uicontrol( ...
+        'Parent', artoaGui.editTimeOfArrival.frameControlsSoundSourceColors, ...
+        'String', '', ...
+        'Style', 'text', ...
+        'FontSize', 8, ...
+        'Units', 'normalized', ...
+        'Position', [(marginLeft + .1) (1 - spaceTopAndBottom - offset) .1 .03], ...
+        'Background', artoaWorkspace.soundsourceColors(i, :) ...
+    );
+    artoaGui.editTimeOfArrival.labelSoundsourcesColors.([fnames{i} 'c']) = uicontrol( ...
+        'Parent', artoaGui.editTimeOfArrival.frameControlsSoundSourceColors, ...
+        'String', fnames{i}, ...
+        'Style', 'text', ...
+        'FontSize', 8, ...
+        'Units', 'normalized', ...
+        'Position', [(marginLeft + .25) (1 - spaceTopAndBottom - offset) .3 .03], ...
+        'Background', [1 1 1], ...
+        'HorizontalAlignment', 'left' ...
+    );
+    
+end
+
+end
+
diff --git a/lib/+artoa/+controller/+edit/+timeOfArrival/plot.m b/lib/+artoa/+controller/+edit/+timeOfArrival/plot.m
index 4189a8991be9d86ded7413df4d1be8f2bb899575..a156082c0db0496d1314380f472b7b6afaf4a986 100644
--- a/lib/+artoa/+controller/+edit/+timeOfArrival/plot.m
+++ b/lib/+artoa/+controller/+edit/+timeOfArrival/plot.m
@@ -34,7 +34,9 @@ if isfield(artoaGui.editTimeOfArrival, 'scatterTimeOfArrival') ...
     artoaGui.editTimeOfArrival.scatterTimeOfArrival.CData = c;
     % update applied sound sources
     artoa.controller.edit.timeOfArrival.plotAppliedSoundsources();
+    artoa.controller.edit.timeOfArrival.plotSoundsourceToaFromGps(artoaWorkspace.filteredSoundsources);
     artoa.controller.edit.timeOfArrival.applyToaAxesToGpsAndSoundsources();
+    artoa.controller.edit.timeOfArrival.createSoundsourceColorsPanel();
     return
 end
 
diff --git a/lib/+artoa/+controller/+edit/+timeOfArrival/plotSoundsourceToaFromGps.m b/lib/+artoa/+controller/+edit/+timeOfArrival/plotSoundsourceToaFromGps.m
index cd7bd41aa9423c1a1bc85d7b839b4d0fb2e12c25..394c4817e508979027a2fef15de9204bb4285abd 100644
--- a/lib/+artoa/+controller/+edit/+timeOfArrival/plotSoundsourceToaFromGps.m
+++ b/lib/+artoa/+controller/+edit/+timeOfArrival/plotSoundsourceToaFromGps.m
@@ -16,6 +16,7 @@ hold(artoaGui.editTimeOfArrival.axesToaFromGps, 'on');
 yMax = max(artoaGui.editTimeOfArrival.axesScatterTimeOfArrival.YLim);
 yMin = min(artoaGui.editTimeOfArrival.axesScatterTimeOfArrival.YLim);
 
+%% Create plot
 fnames = fieldnames(pSoundsources);
 
 for o = 1:length(fnames)
diff --git a/lib/+artoa/+controller/+file/loadArtoaIni.m b/lib/+artoa/+controller/+file/loadArtoaIni.m
index 143d140e399e68618d835f7d989ac85da71b6e74..d0274193851c0af040702eef8b51acb813b0eb45 100644
--- a/lib/+artoa/+controller/+file/loadArtoaIni.m
+++ b/lib/+artoa/+controller/+file/loadArtoaIni.m
@@ -15,6 +15,8 @@ if isempty(artoaDataInput.ini)
     error([mfilename ': artoa.ini has been found but is empty. Please use a valid artoa.ini!']);
 end
 
+artoa.controller.edit.timeOfArrival.plot();
+
 
 end
 
diff --git a/lib/+artoa/+gui/+edit/timeOfArrival.m b/lib/+artoa/+gui/+edit/timeOfArrival.m
index 3272d4bb8d4633d98f549b26fb8627c511e1ff44..1bdffd18c0447fc5220f1b767b4205c9b92cfad8 100644
--- a/lib/+artoa/+gui/+edit/timeOfArrival.m
+++ b/lib/+artoa/+gui/+edit/timeOfArrival.m
@@ -151,44 +151,7 @@ artoaGui.editTimeOfArrival.buttonWithdrawAllVisible = uicontrol( ...
 
 %% Sound source color legend frame
 
-artoaGui.editTimeOfArrival.frameControlsSoundSourceColors = uipanel( ...
-    'Title', 'Soundsource colors', ...
-    'Units', 'normalized', ...
-    'BackgroundColor', 'white', ...
-    'Position', [.01 .2 width .7] ...
-);
-
-% add label and color for every sound source that is available
-usedHeight = .8;
-spaceTopAndBottom = .05;
-offset = 0;
-
-artoaGui.editTimeOfArrival.labelSoundsourcesColors = struct();
-soundsources = artoaWorkspace.filteredSoundsources;
-fnames = fieldnames(soundsources);
-
-for i = 1:length(fnames)
-    artoaGui.editTimeOfArrival.labelSoundsourcesColors.(fnames{i}) = uicontrol( ...
-        'Parent', artoaGui.editTimeOfArrival.frameControlsSoundSourceColors, ...
-        'String', '', ...
-        'Style', 'text', ...
-        'FontSize', 8, ...
-        'Units', 'normalized', ...
-        'Position', [.1 (1 - spaceTopAndBottom - offset) .1 .03], ...
-        'Background', artoaWorkspace.soundsourceColors(i, :) ...
-    );
-    artoaGui.editTimeOfArrival.labelSoundsourcesColors.([fnames{i} 'c']) = uicontrol( ...
-        'Parent', artoaGui.editTimeOfArrival.frameControlsSoundSourceColors, ...
-        'String', fnames{i}, ...
-        'Style', 'text', ...
-        'FontSize', 8, ...
-        'Units', 'normalized', ...
-        'Position', [.25 (1 - spaceTopAndBottom - offset) .5 .03], ...
-        'Background', [1 1 1], ...
-        'HorizontalAlignment', 'left' ...
-    );
-    offset = offset + 0.04;
-end
+artoa.controller.edit.timeOfArrival.createSoundsourceColorsPanel();
 
 %% Colormap slider