diff --git a/app-frontend/src/containers/nodes/DockerRegistries.tsx b/app-frontend/src/containers/nodes/DockerRegistries.tsx
index a7e7948..90dd029 100644
--- a/app-frontend/src/containers/nodes/DockerRegistries.tsx
+++ b/app-frontend/src/containers/nodes/DockerRegistries.tsx
@@ -1,5 +1,5 @@
 import React, { Component } from "react";
-import { Collapse, Row } from "antd";
+import { Collapse, Row, Button, Alert } from "antd";
 import DockerRegistriesStaticInfo from "./DockerRegistriesStaticInfo";
 import ApiComponent from "../global/ApiComponent";
 import CenteredSpinner from "../global/CenteredSpinner";
@@ -7,6 +7,7 @@ import Toaster from "../../utils/Toaster";
 import DefaultDockerRegistry from "./DefaultDockerRegistry";
 import DockerRegistryTable from "./DockerRegistryTable";
 import { IRegistryApi, IRegistryInfo } from "../../models/IRegistryInfo";
+import DockerRegistryAdd from "./DockerRegistryAdd";
 
 export default class DockerRegistries extends ApiComponent<
   {},
@@ -45,6 +46,11 @@ export default class DockerRegistries extends ApiComponent<
     console.log("editRegistry: ", dockerRegistry);
   }
 
+  addDockerRegistry(dockerRegistry: IRegistryInfo) {
+    // TODO
+    console.log("addDockerRegistry: ", dockerRegistry);
+  }
+
   componentDidMount() {
     this.fetchData();
   }
@@ -60,24 +66,47 @@ export default class DockerRegistries extends ApiComponent<
         <DockerRegistriesStaticInfo />
 
         <div style={{ height: 30 }} />
+        <div
+          style={{ textAlign: "center" }}
+          className={
+            this.state.apiData.registries.length === 0 ? "" : "hide-on-demand"
+          }
+        >
+          <Alert
+            type="info"
+            message="No registries is added yet. Go ahead and add your first registry!"
+          />
+        </div>
 
-        <DefaultDockerRegistry
-          apiData={self.state.apiData!}
-          changeDefault={id => {
-            self.changeDefault(id);
-          }}
-        />
+        <div
+          className={
+            this.state.apiData.registries.length > 0 ? "" : "hide-on-demand"
+          }
+        >
+          <DefaultDockerRegistry
+            apiData={self.state.apiData!}
+            changeDefault={id => {
+              self.changeDefault(id);
+            }}
+          />
 
-        <div style={{ height: 20 }} />
+          <div style={{ height: 10 }} />
 
-        <DockerRegistryTable
-          apiData={self.state.apiData}
-          deleteRegistry={id => {
-            self.deleteRegistry(id);
-          }}
-          editRegistry={dockerRegistry => {
-            self.editRegistry(dockerRegistry);
-          }}
+          <DockerRegistryTable
+            apiData={self.state.apiData!}
+            deleteRegistry={id => {
+              self.deleteRegistry(id);
+            }}
+            editRegistry={dockerRegistry => {
+              self.editRegistry(dockerRegistry);
+            }}
+          />
+        </div>
+        <div style={{ height: 50 }} />
+        <DockerRegistryAdd
+          addDockerRegistry={dockerRegistry =>
+            self.addDockerRegistry(dockerRegistry)
+          }
         />
       </div>
     );
diff --git a/app-frontend/src/containers/nodes/DockerRegistryAdd.tsx b/app-frontend/src/containers/nodes/DockerRegistryAdd.tsx
new file mode 100644
index 0000000..0c2c9ef
--- /dev/null
+++ b/app-frontend/src/containers/nodes/DockerRegistryAdd.tsx
@@ -0,0 +1,22 @@
+import React, { Component } from "react";
+import { Button, Row } from "antd";
+import { IRegistryInfo } from "../../models/IRegistryInfo";
+
+export default class DockerRegistryAdd extends Component<{
+  addDockerRegistry: (dockerRegistry: IRegistryInfo) => void;
+}> {
+  render() {
+    return (
+      <div>
+        <Row type="flex" justify="end">
+          <Button>Add Self-Hosted Registry</Button>
+        </Row>
+
+        <div style={{ height: 20 }} />
+        <Row type="flex" justify="end">
+          <Button>Add Remote Registry</Button>
+        </Row>
+      </div>
+    );
+  }
+}
diff --git a/app-frontend/src/containers/nodes/DockerRegistryTable.tsx b/app-frontend/src/containers/nodes/DockerRegistryTable.tsx
index a807525..5810733 100644
--- a/app-frontend/src/containers/nodes/DockerRegistryTable.tsx
+++ b/app-frontend/src/containers/nodes/DockerRegistryTable.tsx
@@ -1,14 +1,45 @@
 import React, { Component } from "react";
+import { Table } from "antd";
+import { IRegistryApi, IRegistryInfo } from "../../models/IRegistryInfo";
 
 export default class DockerRegistryTable extends Component<{
-  apiData: any;
-  editRegistry: (dockerRegistry: any) => void;
+  apiData: IRegistryApi;
+  editRegistry: (dockerRegistry: IRegistryInfo) => void;
   deleteRegistry: (regId: string) => void;
 }> {
+  getCols() {
+    const columns = [
+      {
+        title: "User",
+        dataIndex: "registryUser"
+      },
+      {
+        title: "Password",
+        dataIndex: "registryPassword"
+      },
+      {
+        title: "Domain",
+        dataIndex: "registryDomain"
+      },
+      {
+        title: "Image Prefix",
+        dataIndex: "registryImagePrefix"
+      }
+    ];
+    return columns;
+  }
+
   render() {
     return (
       <div>
-        <p>DockerRegistryTable</p>
+        <p>Docker Registries</p>
+        <div>
+          <Table
+            pagination={false}
+            columns={this.getCols()}
+            dataSource={this.props.apiData.registries}
+          />
+        </div>
       </div>
     );
   }