diff --git a/src/app/controllers/graphiteTarget.js b/src/app/controllers/graphiteTarget.js
index f528d6f9863..043013723f6 100644
--- a/src/app/controllers/graphiteTarget.js
+++ b/src/app/controllers/graphiteTarget.js
@@ -1,7 +1,8 @@
 define([
   'angular',
+  'underscore'
 ],
-function (angular) {
+function (angular, _) {
   'use strict';
 
   var module = angular.module('kibana.controllers');
@@ -9,7 +10,19 @@ function (angular) {
   module.controller('GraphiteTargetCtrl', function($scope) {
 
       $scope.init = function() {
-        console.log('target:', $scope.target);
+        $scope.segments = [];
+        var strSegments = $scope.target.target.split('.');
+        _.each(strSegments, function (segment, index) {
+          if (segment === '*') {
+            segment = '<i class="icon-asterisk"><i>';
+          }
+
+          $scope.segments[index] = { val: segment };
+        });
+      };
+
+      $scope.setSegmentStar = function (index) {
+        $scope.segments[index] = {val: '<i class="icon-asterisk"><i>' };
       };
 
       $scope.targetChanged = function() {
diff --git a/src/app/panels/graphite/editor.html b/src/app/panels/graphite/editor.html
index c21ca7479c0..2a2770409f3 100644
--- a/src/app/panels/graphite/editor.html
+++ b/src/app/panels/graphite/editor.html
@@ -1,7 +1,68 @@
 <div class="editor-row">
+  <style>
 
-	<div ng-repeat="target in panel.targets" ng-controller="GraphiteTargetCtrl">
-  	<div class="row-fluid">
+    .grafana-target {
+      border-top: 1px solid #444444;
+      border-bottom: 1px solid #444444;
+    }
+    .grafana-target-top td {
+      border-top: 1px solid black;
+      border-bottom: 1px solid black;
+      background: #202020;
+      padding: 0;
+      margin: 0;
+    }
+    .grafana-segment-list {
+      list-style: none;
+      margin: 0;
+      margin-left: 5px;
+    }
+    .grafana-segment-list li {
+      float: left;
+    }
+    .grafana-target-segment {
+      padding: 5px 7px;
+      display: inline-block;
+      font-weight: normal;
+      border-left: 1px solid #050505;
+      color: #c8c8c8;
+    }
+    .grafana-target .dropdown {
+      padding: 0; margin: 0;
+    }
+    .grafana-target-segment:hover {
+      text-decoration: none;
+    }
+    a.grafana-target-segment:focus {
+      outline: 0;
+    }
+  </style>
+
+	<div class="grafana-target" ng-repeat="target in panel.targets" ng-controller="GraphiteTargetCtrl" ng-init="init()">
+
+    <table style="margin: 0; padding: 0;width:100%;">
+      <tr class="grafana-target-top">
+        <td style="padding-left: 5px;"><i class="icon-eye-open"></i></td>
+        <td>
+          <ul class="grafana-segment-list">
+          <li class="dropdown" ng-repeat="segment in segments">
+            <a  class="grafana-target-segment dropdown-toggle"
+                data-toggle="dropdown"
+                data-placement="bottom" ng-bind-html-unsafe="segment.val"></a>
+            <ul class="dropdown-menu">
+              <li>
+                <a ng-click="setSegmentStar($index)">All <i class="icon-star" /></a>
+              </li>
+            </ul>
+          </li>
+          <ul>
+        </td>
+        <td>
+            <i class="icon-remove"></i>
+        </td>
+      </tr>
+    </table>
+    <!-- <div class="row-fluid">
   		<div class="span12">
         <span ng-if="!editMode">
           {{target.target}}
@@ -15,9 +76,10 @@
     	 </span>
 
       </div>
-    </div>
+    </div> -->
   </div>
 
-  <a ng-click="add_target(panel.target)"  ng-show="editor.index == 1">Add target</a>
-
+  <div class="row-fluid" style="margin-top: 20px">
+    <a class="pull-right" ng-click="add_target(panel.target)"  ng-show="editor.index == 1">Add target</a>
+  </div>
 </div>
\ No newline at end of file
diff --git a/src/app/panels/graphite/module.js b/src/app/panels/graphite/module.js
index 109ffd5c987..7cfe00ec899 100644
--- a/src/app/panels/graphite/module.js
+++ b/src/app/panels/graphite/module.js
@@ -211,6 +211,7 @@ function (angular, app, $, _, kbn, moment, timeSeries, graphiteSrv, RQ) {
     $scope.init = function() {
       // Hide view options by default
       $scope.options = false;
+      $scope.editor = {index: 1};
 
       // Always show the query if an alias isn't set. Users can set an alias if the query is too
       // long
@@ -422,7 +423,6 @@ function (angular, app, $, _, kbn, moment, timeSeries, graphiteSrv, RQ) {
       $scope.$emit('render');
     };
 
-
     $scope.setEditorTabs = function(panelMeta) {
       $scope.editorTabs = ['General'];
       if(!_.isUndefined(panelMeta.editorTabs)) {
diff --git a/src/app/partials/dashboard.html b/src/app/partials/dashboard.html
index ab664e41825..e63df3b2ba4 100644
--- a/src/app/partials/dashboard.html
+++ b/src/app/partials/dashboard.html
@@ -14,6 +14,7 @@
   <div class="row-fluid">
     <div class="row-fluid container" style="margin-top:10px; width:98%">
       <div ng-show="fullEditMode" class="modal-backdrop fade in"></div>
+
       <!-- Rows -->
       <div class="row-fluid kibana-row" ng-controller="RowCtrl" ng-repeat="(row_name, row) in dashboard.current.rows" ng-style="row_style(row)">
         <div class="row-control">