diff --git a/gerbview/X2_gerber_attributes.cpp b/gerbview/X2_gerber_attributes.cpp
index a58c057eb7..4ab80cb142 100644
--- a/gerbview/X2_gerber_attributes.cpp
+++ b/gerbview/X2_gerber_attributes.cpp
@@ -236,7 +236,7 @@ bool X2_ATTRIBUTE_FILEFUNCTION::IsDrillFile()
 
 void X2_ATTRIBUTE_FILEFUNCTION::set_Z_Order()
 {
-    m_z_order = -100;     // low level
+    m_z_order = 100;     // high level
     m_z_sub_order = 0;
 
     if( IsCopper() )
diff --git a/gerbview/gerber_file_image_list.cpp b/gerbview/gerber_file_image_list.cpp
index 90ba05dd94..41e173118d 100644
--- a/gerbview/gerber_file_image_list.cpp
+++ b/gerbview/gerber_file_image_list.cpp
@@ -228,6 +228,7 @@ static struct GERBER_ORDER gerberFileExtensionOrder[] =
        { ".XLN",        GERBER_ORDER_ENUM::GERBER_DRILL },
        { ".TAP",        GERBER_ORDER_ENUM::GERBER_DRILL },
        { ".DRD",        GERBER_ORDER_ENUM::GERBER_DRILL },
+       { ".DRL",        GERBER_ORDER_ENUM::GERBER_DRILL },
        { ".NC",         GERBER_ORDER_ENUM::GERBER_DRILL },
        { ".XNC",        GERBER_ORDER_ENUM::GERBER_DRILL },
 
diff --git a/gerbview/gerber_file_image_list.h b/gerbview/gerber_file_image_list.h
index 5d594ed4f8..b155eb9708 100644
--- a/gerbview/gerber_file_image_list.h
+++ b/gerbview/gerber_file_image_list.h
@@ -35,7 +35,11 @@
 
 enum class GERBER_ORDER_ENUM : int
 {
-    GERBER_TOP_PASTE = 0,
+    GERBER_DRILL = 0,
+    GERBER_BOARD_OUTLINE,
+    GERBER_KEEP_OUT,
+    GERBER_MECHANICAL,
+    GERBER_TOP_PASTE,
     GERBER_TOP_SILK_SCREEN,
     GERBER_TOP_SOLDER_MASK,
     GERBER_TOP_COPPER,
@@ -44,10 +48,6 @@ enum class GERBER_ORDER_ENUM : int
     GERBER_BOTTOM_SOLDER_MASK,
     GERBER_BOTTOM_SILK_SCREEN,
     GERBER_BOTTOM_PASTE,
-    GERBER_KEEP_OUT,
-    GERBER_MECHANICAL,
-    GERBER_BOARD_OUTLINE,
-    GERBER_DRILL,
     GERBER_LAYER_UNKNOWN,
 };