diff --git a/apps/yms/gui/BUCK b/apps/yms/gui/BUCK
new file mode 100644
index 0000000..3d9073e
--- /dev/null
+++ b/apps/yms/gui/BUCK
@@ -0,0 +1,16 @@
+COMPILE_DEPS = [
+    '//lib:CORE_DEPS',
+]
+
+osgi_jar_with_tests (
+    deps = COMPILE_DEPS,
+    resources_root = 'src/main/resources',
+    resources = glob(['src/main/resources/**']),
+)
+
+onos_app (
+    title = 'YANG Runtime GUI',
+    category = 'Utility',
+    url = 'http://onosproject.org',
+    description = 'YANG Runtime GUI application for visualization of registered YANG models.',
+)
diff --git a/apps/yms/gui/src/main/java/org/onosproject/yms/gui/YangModelMessageHandler.java b/apps/yms/gui/src/main/java/org/onosproject/yms/gui/YangModelMessageHandler.java
index e24c06f..1e4f86e 100644
--- a/apps/yms/gui/src/main/java/org/onosproject/yms/gui/YangModelMessageHandler.java
+++ b/apps/yms/gui/src/main/java/org/onosproject/yms/gui/YangModelMessageHandler.java
@@ -24,7 +24,6 @@
 import org.onosproject.ui.UiMessageHandler;
 import org.onosproject.ui.table.TableModel;
 import org.onosproject.ui.table.TableRequestHandler;
-import org.onosproject.yms.ymsm.YmsService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -54,7 +53,7 @@
 
     private final Logger log = LoggerFactory.getLogger(getClass());
 
-    private YmsService ymsService;
+//    private YmsService ymsService;
     // TODO: fill out other fields as necessary
 
 
@@ -63,7 +62,7 @@
     @Override
     public void init(UiConnection connection, ServiceDirectory directory) {
         super.init(connection, directory);
-        ymsService = directory.get(YmsService.class);
+//        ymsService = directory.get(YmsService.class);
         // TODO: addListeners(); ???
     }
 
diff --git a/apps/yms/gui/src/main/java/org/onosproject/yms/gui/YangModelUiComponent.java b/apps/yms/gui/src/main/java/org/onosproject/yms/gui/YangModelUiComponent.java
index 2c96b00..c3f883e 100644
--- a/apps/yms/gui/src/main/java/org/onosproject/yms/gui/YangModelUiComponent.java
+++ b/apps/yms/gui/src/main/java/org/onosproject/yms/gui/YangModelUiComponent.java
@@ -42,7 +42,7 @@
     private static final ClassLoader CL =
             YangModelUiComponent.class.getClassLoader();
     private static final String VIEW_ID = "yangModel";
-    private static final String NAV_LABEL = "Yang Models";
+    private static final String NAV_LABEL = "YANG Models";
     private static final String NAV_ICON = "nav_yang";
     private static final String HELP_URL =
             "https://wiki.onosproject.org/display/ONOS/YANG+Models+in+ONOS";
diff --git a/apps/yms/gui/src/main/java/org/onosproject/yms/gui/package-info.java b/apps/yms/gui/src/main/java/org/onosproject/yms/gui/package-info.java
new file mode 100644
index 0000000..5ec2d11
--- /dev/null
+++ b/apps/yms/gui/src/main/java/org/onosproject/yms/gui/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2017-present Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * GUI elements for YANG Runtime &amp; Live YANG Compiler subsystem.
+ */
+package org.onosproject.yms.gui;
\ No newline at end of file
diff --git a/modules.defs b/modules.defs
index 7395ade..b6c71d9 100644
--- a/modules.defs
+++ b/modules.defs
@@ -173,6 +173,7 @@
     '//apps/scalablegateway:onos-apps-scalablegateway-oar',
     '//apps/castor:onos-apps-castor-oar',
     '//apps/yms:onos-apps-yms-oar',
+    '//apps/yms/gui:onos-apps-yms-gui-oar',
     '//apps/ofagent:onos-apps-ofagent-oar',
     '//apps/mappingmanagement:onos-apps-mappingmanagement-oar',
     '//apps/config:onos-apps-config-oar',