diff --git a/elements/_grouping.scss b/elements/_grouping.scss
index b3b9082..3278c79 100644
--- a/elements/_grouping.scss
+++ b/elements/_grouping.scss
@@ -318,7 +318,7 @@ div {
 }
 
 // Grid
-.grid {
+.dis_grid {
 	display: grid;
 	grid-gap: config.$space_basic;
 
@@ -332,15 +332,15 @@ div {
 		margin: config.$width_border_io;
 		padding: config.$space_half;
 	}
-}
 
-.grid_column_2 {
-	grid-template-columns: max-content max-content;
+	&.grid_column_2 {
+		grid-template-columns: max-content max-content;
 
-}
+	}
 
-.grid_column_4 {
-	grid-template-columns: max-content max-content max-content max-content;
+	&.grid_column_4 {
+		grid-template-columns: max-content max-content max-content max-content;
+	}
 }
 
 // Sprites
diff --git a/elements/_sections.scss b/elements/_sections.scss
index 920a854..4390c31 100644
--- a/elements/_sections.scss
+++ b/elements/_sections.scss
@@ -1,10 +1,10 @@
+@use "sass:map";
+
 @use "../global/config";
 @use "../global/common";
 @use "../elements/interactive";
 @use "../mixins/media_query" as *;
 
-@use "sass:map";
-
 // Root
 // -----------------------------------------------------------------------------
 html {
diff --git a/elements/_tables.scss b/elements/_tables.scss
index 316e7f9..e1d6849 100644
--- a/elements/_tables.scss
+++ b/elements/_tables.scss
@@ -58,20 +58,15 @@ table {
 		table-layout: fixed;
 	}
 
-	&.flexible {
+	&.grid {
+		display: grid;
+		grid-template-columns: auto 1fr auto;
+		border-bottom: 0;
+
+		thead,
+		tbody,
 		tr {
-			display: flex;
-			flex-flow: row nowrap;
-			align-items: stretch;
-
-			&:last-child td {
-				border-bottom: none;
-			}
-
-			td.truncate {
-				flex: 1;
-				min-width: 0;
-			}
+			display: contents;
 		}
 	}
 
diff --git a/mixins/_media_query.scss b/mixins/_media_query.scss
index 7cef3e1..ead46b3 100644
--- a/mixins/_media_query.scss
+++ b/mixins/_media_query.scss
@@ -1,7 +1,7 @@
-@use "../global/config";
-
 @use "sass:math";
 
+@use "../global/config";
+
 //Sections for Media Queries
 @mixin forPhoneUp {
   @media (min-width: #{config.$screen_tiny - 1}) { @content; } //599px
diff --git a/modules/io/_io_module.scss b/modules/io/_io_module.scss
index 50ecbab..b19b23f 100644
--- a/modules/io/_io_module.scss
+++ b/modules/io/_io_module.scss
@@ -21,6 +21,7 @@ footer {
 
 		nav > span,
 		nav label,
+		.group_nav > span,
 		.a_button {
 			@extend %basic;
 			border: config.$width_border_io solid transparent;
@@ -31,12 +32,12 @@ footer {
 			@extend .button_io;
 		}
 
-		.group-input {
+		.group_nav {
 			display: flex;
 			flex-flow: row nowrap;
 		}
 
-		.group-input-wrap {
+		.wrap_input {
 			border: config.$width_border_io solid transparent;
 			padding: config.$padding_basic;
 			background-color: config.$color_back_io;