diff --git a/ngapp/src/app/connections/connections-cards/connections-cards.component.html b/ngapp/src/app/connections/connections-cards/connections-cards.component.html
index 04f69eb6..a0b3bc19 100644
--- a/ngapp/src/app/connections/connections-cards/connections-cards.component.html
+++ b/ngapp/src/app/connections/connections-cards/connections-cards.component.html
@@ -1,5 +1,5 @@
-<div class="row-cards-pf">
-  <div class="col-xs-12 col-sm-3 col-md-3" *ngFor="let connection of connections">
+<div class="object-card-container">
+  <div *ngFor="let connection of connections">
     <app-connection-card [connection]="connection"
                          [selectedConnections]="selectedConnections"
                          (cardEvent)="onCardEvent($event)"
diff --git a/ngapp/src/app/dataservices/dataservices-cards/dataservices-cards.component.css b/ngapp/src/app/dataservices/dataservices-cards/dataservices-cards.component.css
index 8abeffb9..e69de29b 100644
--- a/ngapp/src/app/dataservices/dataservices-cards/dataservices-cards.component.css
+++ b/ngapp/src/app/dataservices/dataservices-cards/dataservices-cards.component.css
@@ -1,8 +0,0 @@
-.container-cards-pf {
-  padding: 0;
-  margin-top: 0;
-}
-
-.row-cards-pf {
-  padding: 0;
-}
diff --git a/ngapp/src/app/dataservices/dataservices-cards/dataservices-cards.component.html b/ngapp/src/app/dataservices/dataservices-cards/dataservices-cards.component.html
index e0f133ca..4ca76da5 100644
--- a/ngapp/src/app/dataservices/dataservices-cards/dataservices-cards.component.html
+++ b/ngapp/src/app/dataservices/dataservices-cards/dataservices-cards.component.html
@@ -1,5 +1,5 @@
-<div class="row-cards-pf">
-  <div class="col-xs-12 col-sm-3 col-md-3" *ngFor="let dataservice of dataservices">
+<div class="object-card-container">
+  <div *ngFor="let dataservice of dataservices">
     <app-dataservice-card-component [dataservice]="dataservice"
                                     [selectedDataservices]="selectedDataservices"
                                     (cardEvent)="onCardEvent($event)"
diff --git a/ngapp/src/styles.css b/ngapp/src/styles.css
index ff82f1a1..1d6f80b0 100644
--- a/ngapp/src/styles.css
+++ b/ngapp/src/styles.css
@@ -116,7 +116,6 @@
 //-ms-transition: background-color 300ms;
   -o-transition: background-color 300ms;
   transition: background-color 300ms;
-  height: 160px;
 }
 
 .object-card .card-pf,
@@ -124,6 +123,16 @@
   margin: 8px 0;
 }
 
+.object-card-container {
+  display: grid;
+  grid-template-columns: repeat( auto-fill, minmax( 300px, 300px ) );
+}
+
+.object-card-container>* {
+  flex: 1 1 80px;
+  margin: 5px;
+}
+
 .object-card-selected .card-pf {
   border: var(--card-border-width) var(--card-border-style) var(--card-border-color);
 }