diff --git a/drupalgap.js b/drupalgap.js
index 07806fa..4f5a5ee 100644
--- a/drupalgap.js
+++ b/drupalgap.js
@@ -7,13 +7,13 @@
     attach: function (context, settings) {
       try {
         var drupalgap_documentation_link = '<a href="http://drupal.org/node/2015065" target="_blank">View DrupalGap Troubleshooting Topics</a>';
-        $('#drupalgap-system-connect-status-message').html("<img src='" + Drupal.settings.basePath  + "misc/throbber.gif' />");
+        $('#drupalgap-system-connect-status-message').html("<img src='" + drupalSettings.basePath  + "misc/throbber.gif' />");
         // Obtain session token.
-        var token_url = "?q=services/session/token"
+        var token_url = "?q=rest/session/token"
         $.ajax({
           url:token_url,
           type:"get",
-          dataType:"text",
+          dataType:"html",
           error:function (jqXHR, textStatus, errorThrown) {
             if (!errorThrown) {
               errorThrown = Drupal.t('Token retrieval failed!');
@@ -24,7 +24,7 @@
           },
           success: function (token) {
             // Call system connect with session token.
-            $.ajax({
+            /*$.ajax({
               url: Drupal.settings.drupalgap.services_endpoint_default + 'system/connect.json',
               type: "post",
               dataType: "json",
@@ -43,7 +43,7 @@
                 msg = Drupal.t("The system connect test was successful, <strong>DrupalGap is configured properly!</strong>");
                 $('#drupalgap-system-connect-status-message').html("<div class='messages status'>" + msg + "</div>");
               }
-            });
+            });*/
           }
         });
       }
diff --git a/drupalgap.links.menu.yml b/drupalgap.links.menu.yml
new file mode 100644
index 0000000..2709ccd
--- /dev/null
+++ b/drupalgap.links.menu.yml
@@ -0,0 +1,6 @@
+drupalgap.admin:
+  title: 'Drupalgap'
+  description: 'Manage Drupalgap configuration.'
+  parent: system.admin_config_services
+  route_name: drupalgap.drupalgap_config
+
diff --git a/src/Controller/DrupalGapController.php b/src/Controller/DrupalGapController.php
index 345e0c4..9173aa9 100644
--- a/src/Controller/DrupalGapController.php
+++ b/src/Controller/DrupalGapController.php
@@ -24,11 +24,46 @@ class DrupalGapController extends ControllerBase {
     $output = array();
 
     $output['drupalgap'] = array(
-      '#markup' => 'DrupalGap Hello World COnfig!',
+      '#attached' => array(
+        'js' => array(
+          drupal_get_path('module', 'drupalgap') . '/drupalgap.js' => array(),
+        ),
+      ),
+      // Render the Status connection and some help docs.
+      '#markup' => \Drupal::service('renderer')->render($this->drupalStatus()),
     );
 
     return $output;
   }
 
-}
+  /**
+   * Checks the current status and add help link.
+   *
+   * @return array
+   *   An array to be rendered with the id for the div where we will check the status and an information link.
+   */
+  public function drupalStatus() {
+    // Set div id for system connect status message box.
+    $div_id = 'drupalgap-system-connect-status-message';
+
+    // Build more info text and help link string.
+    $msg = t('Please refer to the <a href="@help_page">DrupalGap Module Help Page</a> for more information.', array('@help_page' => 'admin/help/drupalgap'));
+
+    // Create output fieldsets.
+    $output = array(
+      'drupalgap_system_connect_status' => array(
+        '#theme' => 'fieldset',
+        '#title' => t('System Connect Status'),
+        '#description' => '<div id="' . $div_id . '">&nbsp;</div>',
+      ),
+      'drupalgap_information' => array(
+        '#theme' => 'fieldset',
+        '#title' => t('More Information'),
+        '#description' => "<p>$msg</p>"
+      ),
+    );
+
+    return $output;
 
+  }
+}