diff --git a/src/main/kotlin/Rs2MapEditor.kt b/src/main/kotlin/Rs2MapEditor.kt
index 12d88eb..aff3cf4 100644
--- a/src/main/kotlin/Rs2MapEditor.kt
+++ b/src/main/kotlin/Rs2MapEditor.kt
@@ -137,7 +137,7 @@ object Rs2MapEditor {
                 for (column in 0 until mapWidth) {
                     gbc.gridx = column
                     gbc.gridy = row
-                    val border: Border = MatteBorder(1, 1, if (row == mapHeight) 1 else 0, if (column == mapWidth) 1 else 0, Color.GRAY)
+                    val border: Border = MatteBorder(1, 1, if (row == mapHeight) 1 else 0, if (column == mapWidth) 1 else 0, Color(255,255,255,25))
                     val flippedY = (64 - row) - 1
                     val point = Point(column, flippedY)
                     colorPointMap[point] = MapTileParser.definition.getTile(column, flippedY, plane).underlayId - 1
diff --git a/src/main/kotlin/cacheops/cache/definition/encoder/GroundItemEncoder.kt b/src/main/kotlin/cacheops/cache/definition/encoder/GroundItemEncoder.kt
index 4849002..03bafe1 100644
--- a/src/main/kotlin/cacheops/cache/definition/encoder/GroundItemEncoder.kt
+++ b/src/main/kotlin/cacheops/cache/definition/encoder/GroundItemEncoder.kt
@@ -15,7 +15,7 @@ object GroundItemEncoder {
 
         // Put data to buffer
         item.forEach {
-            val formattedCoord = ((it.y or (it.x shl 7)) or (it.plane shl 14))
+            val formattedCoord = (it.plane shl 14) or (it.x shl 7) or it.y
             buffer.putShort(formattedCoord.toShort())
             buffer.putShort(it.id.toShort())
             buffer.putShort(it.respawnTime.toShort())
diff --git a/src/main/kotlin/cacheops/cache/definition/encoder/NPCSpawnEncoder.kt b/src/main/kotlin/cacheops/cache/definition/encoder/NPCSpawnEncoder.kt
index 4268e29..f3a0ee2 100644
--- a/src/main/kotlin/cacheops/cache/definition/encoder/NPCSpawnEncoder.kt
+++ b/src/main/kotlin/cacheops/cache/definition/encoder/NPCSpawnEncoder.kt
@@ -12,7 +12,7 @@ object NPCSpawnEncoder {
         val buffer = ByteBuffer.allocate(npc.size * 4)
 
         npc.forEach {
-            val formattedCoord = ((it.y or (it.x shl 7)) or (it.plane shl 14))
+            val formattedCoord = (it.plane shl 14) or (it.x shl 7) or it.y
             buffer.putShort(formattedCoord.toShort())
             buffer.putShort(it.id.toShort())
         }