diff --git a/js/ColorModule.js b/js/ColorModule.js
index 9087397..1021d5b 100644
--- a/js/ColorModule.js
+++ b/js/ColorModule.js
@@ -433,7 +433,7 @@ const ColorModule = (() => {
         if (refLayer)
             color = refLayer.context.fillStyle;
         
-        for (let i=0; i<currFile.layers.length - 1; i++) {
+        for (let i=0; i<currFile.layers.length; i++) {
             currFile.layers[i].context.fillStyle = color;
             currFile.layers[i].context.strokeStyle = color;
         }
diff --git a/js/tools/EyeDropperTool.js b/js/tools/EyeDropperTool.js
index be54b79..4c033d8 100644
--- a/js/tools/EyeDropperTool.js
+++ b/js/tools/EyeDropperTool.js
@@ -86,7 +86,9 @@ class EyeDropperTool extends Tool {
         // Returned colour
         let selectedColor;
 
-        for (let i=1; i<currFile.layers.length-3; i++) {
+        for (let i=0; i<currFile.layers.length; i++) {
+            if(!currFile.layers[i].isVisible)continue;
+            
             // Getting the colour of the pixel in the cursorLocation
             tmpColour = currFile.layers[i].context.getImageData(Math.floor(cursorLocation[0]/currFile.zoom),Math.floor(cursorLocation[1]/currFile.zoom),1,1).data;
 
diff --git a/js/tools/PanTool.js b/js/tools/PanTool.js
index a013c95..8a55da0 100644
--- a/js/tools/PanTool.js
+++ b/js/tools/PanTool.js
@@ -31,6 +31,9 @@ class PanTool extends Tool {
         for (let i=1; i<currFile.layers.length; i++) {
             currFile.layers[i].copyData(currFile.layers[0]);
         }
+        for (let i=0; i<currFile.sublayers.length; i++) {
+            currFile.sublayers[i].copyData(currFile.layers[0]);
+        }
 	}
 
 	onEnd(mousePos, target) {