diff --git a/app/components/App.js b/app/components/App.js
index a43ea80..7ac23c4 100644
--- a/app/components/App.js
+++ b/app/components/App.js
@@ -28,7 +28,9 @@ export class App extends React.Component {
 
   render(){
     const companyList = this.state.companies.map((company, id) => {
-      return <Company companyObj={company} key={"company_" + id} />
+      if(Object.keys(company.devices).length > 0){
+        return <Company companyObj={company} key={"company_" + id} />
+      }
     })
 
     const loading = <div style={{textAlign: "center", paddingTop: "25px"}}><h1>Loading...</h1></div>
diff --git a/app/components/Company.js b/app/components/Company.js
index fcd89a9..1cd035d 100644
--- a/app/components/Company.js
+++ b/app/components/Company.js
@@ -33,7 +33,7 @@ export class Company extends React.Component {
 
 
     return (
-      <div className="company ui container" id={this.props.id}>
+      <div className="company" style={{marginLeft: "10px", marginRight: "10px"}} id={this.props.id}>
         <h1 className="ui dividing header">{this.props.companyObj.name}</h1>
         {maxWaterSystemCode} 
       </div>
diff --git a/build/transformed.js b/build/transformed.js
index 4c12160..0d5f515 100644
--- a/build/transformed.js
+++ b/build/transformed.js
@@ -22671,7 +22671,9 @@ class App extends __WEBPACK_IMPORTED_MODULE_0_react___default.a.Component {
 
   render() {
     const companyList = this.state.companies.map((company, id) => {
-      return __WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement(__WEBPACK_IMPORTED_MODULE_2__Company__["a" /* Company */], { companyObj: company, key: "company_" + id });
+      if (Object.keys(company.devices).length > 0) {
+        return __WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement(__WEBPACK_IMPORTED_MODULE_2__Company__["a" /* Company */], { companyObj: company, key: "company_" + id });
+      }
     });
 
     const loading = __WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement(
@@ -22744,7 +22746,7 @@ class Company extends __WEBPACK_IMPORTED_MODULE_0_react___default.a.Component {
 
     return __WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement(
       'div',
-      { className: 'company ui container', id: this.props.id },
+      { className: 'company', style: { marginLeft: "10px", marginRight: "10px" }, id: this.props.id },
       __WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement(
         'h1',
         { className: 'ui dividing header' },
diff --git a/server/public/transformed.js b/server/public/transformed.js
index 4c12160..0d5f515 100644
--- a/server/public/transformed.js
+++ b/server/public/transformed.js
@@ -22671,7 +22671,9 @@ class App extends __WEBPACK_IMPORTED_MODULE_0_react___default.a.Component {
 
   render() {
     const companyList = this.state.companies.map((company, id) => {
-      return __WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement(__WEBPACK_IMPORTED_MODULE_2__Company__["a" /* Company */], { companyObj: company, key: "company_" + id });
+      if (Object.keys(company.devices).length > 0) {
+        return __WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement(__WEBPACK_IMPORTED_MODULE_2__Company__["a" /* Company */], { companyObj: company, key: "company_" + id });
+      }
     });
 
     const loading = __WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement(
@@ -22744,7 +22746,7 @@ class Company extends __WEBPACK_IMPORTED_MODULE_0_react___default.a.Component {
 
     return __WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement(
       'div',
-      { className: 'company ui container', id: this.props.id },
+      { className: 'company', style: { marginLeft: "10px", marginRight: "10px" }, id: this.props.id },
       __WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement(
         'h1',
         { className: 'ui dividing header' },