diff --git a/source/GM-TE/GMTEEditor.class.st b/source/GM-TE/GMTEEditor.class.st
index f420f49f..6f95339d 100644
--- a/source/GM-TE/GMTEEditor.class.st
+++ b/source/GM-TE/GMTEEditor.class.st
@@ -15,7 +15,7 @@ Class {
 		'inspector',
 		'morphBuilders'
 	],
-	#category : #'GM-TE'
+	#category : #'GM-TE-UI'
 }
 
 {
diff --git a/source/GM-TE/GMTELayerList.class.st b/source/GM-TE/GMTELayerList.class.st
index a7bffc5b..74a3a056 100644
--- a/source/GM-TE/GMTELayerList.class.st
+++ b/source/GM-TE/GMTELayerList.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #GMTELayerList,
 	#superclass : #Morph,
-	#category : #'GM-TE'
+	#category : #'GM-TE-UI'
 }
 
 {
diff --git a/source/GM-TE/GMTETileContainer.class.st b/source/GM-TE/GMTETileContainer.class.st
index 0b27359e..85f50b08 100644
--- a/source/GM-TE/GMTETileContainer.class.st
+++ b/source/GM-TE/GMTETileContainer.class.st
@@ -7,7 +7,7 @@ Class {
 	#instVars : [
 		'parent'
 	],
-	#category : #'GM-TE',
+	#category : #'GM-TE-UI',
 	#'squeak_changestamp' : 'Alex M 5/21/2024 16:50'
 }
 
diff --git a/source/GM-TE/GMTETileMap.class.st b/source/GM-TE/GMTETileMap.class.st
index 0ad7e8ac..ebe6a57e 100644
--- a/source/GM-TE/GMTETileMap.class.st
+++ b/source/GM-TE/GMTETileMap.class.st
@@ -134,7 +134,7 @@ GMTETileMap >> disableVisualLayer [
 
 {
 	#category : #updating,
-	#'squeak_changestamp' : 'Alex M 6/13/2024 15:15'
+	#'squeak_changestamp' : 'Ivo Zilkenat 6/14/2024 18:59'
 }
 GMTETileMap >> enableVisualLayer [
 
diff --git a/source/GM-TE/GMTETileMatrixLayer.class.st b/source/GM-TE/GMTETileMatrixLayer.class.st
index 76cd6219..e4779c94 100644
--- a/source/GM-TE/GMTETileMatrixLayer.class.st
+++ b/source/GM-TE/GMTETileMatrixLayer.class.st
@@ -41,20 +41,20 @@ GMTETileMatrixLayer >> addTile: aTile at: x at: y [
 
 {
 	#category : #copying,
-	#'squeak_changestamp' : 'Ivo Zilkenat 6/8/2024 22:26'
+	#'squeak_changestamp' : 'Ivo Zilkenat 6/14/2024 19:01'
 }
 GMTETileMatrixLayer >> asRescaledToWidth: aWidth height: aHeight [
 
-	| newMatrix |
-	newMatrix := self class rows: aHeight columns: aWidth.
+	| newLayer |
+	newLayer := self class width: aWidth height: aHeight layerIdx: self layerIdx.
 	
 	"Copy over tiles & handle tile removal"
 	
 	1 to: (aHeight min: self rowCount) do: [:row |
     		1 to: (aWidth min: self columnCount) do: [:col |
-       		 newMatrix at: row at: col put: (self at: row at: col) veryDeepCopy]].
+       		 newLayer at: row at: col put: (self at: row at: col) veryDeepCopy]].
 
-	^newMatrix
+	^newLayer
 	 
 ]
 
diff --git a/source/GM-TE/GMTETileSelector.class.st b/source/GM-TE/GMTETileSelector.class.st
index cd14ba23..a00e7bc8 100644
--- a/source/GM-TE/GMTETileSelector.class.st
+++ b/source/GM-TE/GMTETileSelector.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'model'
 	],
-	#category : #'GM-TE'
+	#category : #'GM-TE-UI'
 }
 
 {
diff --git a/source/GM-TE/GMTETileTray.class.st b/source/GM-TE/GMTETileTray.class.st
index 6efa6d1a..b07a7724 100644
--- a/source/GM-TE/GMTETileTray.class.st
+++ b/source/GM-TE/GMTETileTray.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #GMTETileTray,
 	#superclass : #AlignmentMorph,
-	#category : #'GM-TE'
+	#category : #'GM-TE-UI'
 }
 
 {