diff --git a/RetroFE/Source/Graphics/PageBuilder.cpp b/RetroFE/Source/Graphics/PageBuilder.cpp
index ce58b3e..51ed7d0 100644
--- a/RetroFE/Source/Graphics/PageBuilder.cpp
+++ b/RetroFE/Source/Graphics/PageBuilder.cpp
@@ -96,25 +96,8 @@ Page *PageBuilder::buildPage( std::string collectionName )
         layoutPath = Utils::combinePath(Configuration::absolutePath, "layouts", layoutName, "collections", collectionName);
         layoutPath = Utils::combinePath(layoutPath, "layout");
     }
-    layoutFile = Utils::combinePath(layoutPath, layoutPage + ".xml");
-    if ( screenWidth_*3/4 == screenHeight_ )
-        layoutFileAspect = Utils::combinePath(layoutPath, layoutPage + " 4x3.xml");
-    else if ( screenWidth_*4/3 == screenHeight_ )
-        layoutFileAspect = Utils::combinePath(layoutPath, layoutPage + " 3x4.xml");
-    else if ( screenWidth_*4/5 == screenHeight_ )
-        layoutFileAspect = Utils::combinePath(layoutPath, layoutPage + " 5x4.xml");
-    else if ( screenWidth_*5/4 == screenHeight_ )
-        layoutFileAspect = Utils::combinePath(layoutPath, layoutPage + " 4x5.xml");
-    else if ( screenWidth_*9/16 == screenHeight_ )
-        layoutFileAspect = Utils::combinePath(layoutPath, layoutPage + " 16x9.xml");
-    else if ( screenWidth_*16/9 == screenHeight_ )
-        layoutFileAspect = Utils::combinePath(layoutPath, layoutPage + " 9x16.xml");
-    else if ( screenWidth_*10/16 == screenHeight_ )
-        layoutFileAspect = Utils::combinePath(layoutPath, layoutPage + " 16x10.xml");
-    else if ( screenWidth_*16/10 == screenHeight_ )
-        layoutFileAspect = Utils::combinePath(layoutPath, layoutPage + " 10x16.xml");
-    else
-        layoutFileAspect = Utils::combinePath(layoutPath, layoutPage + ".xml");
+    layoutFile       = Utils::combinePath(layoutPath, layoutPage + ".xml");
+    layoutFileAspect = Utils::combinePath(layoutPath, layoutPage + " " + std::to_string( screenWidth_/std::__gcd( screenWidth_, screenHeight_ ) ) + "x" + std::to_string( screenHeight_/std::__gcd( screenWidth_, screenHeight_ ) ) + ".xml" );
 
     Logger::write(Logger::ZONE_INFO, "Layout", "Initializing " + layoutFileAspect);
 
diff --git a/RetroFE/Source/Version.cpp b/RetroFE/Source/Version.cpp
index 76b11ae..8df1e93 100644
--- a/RetroFE/Source/Version.cpp
+++ b/RetroFE/Source/Version.cpp
@@ -21,7 +21,7 @@
 
 std::string retrofe_version_major = "0";
 std::string retrofe_version_minor = "9";
-std::string retrofe_version_build = "17";
+std::string retrofe_version_build = "18";
 
 
 std::string Version::getString( )