X3DW6 - Add Title of Action to top of Decision Review

33 files changed, 605 insertions, 352 deletions

diff --git a/org.eclipse.osee.ats/plugin.xml b/org.eclipse.osee.ats/plugin.xml
index b72a0df96f7..0ead428efae 100644
--- a/org.eclipse.osee.ats/plugin.xml
+++ b/org.eclipse.osee.ats/plugin.xml
@@ -273,11 +273,35 @@
    <extension

          point="org.eclipse.osee.ats.AtsEditorToolbarService">

       <AtsEditorToolbarService

+            classname="org.eclipse.osee.ats.editor.service.OpenVersionArtifact">

+      </AtsEditorToolbarService>

+      <AtsEditorToolbarService

             classname="org.eclipse.osee.ats.editor.service.OpenInAtsWorldOperation">

       </AtsEditorToolbarService>

       <AtsEditorToolbarService

             classname="org.eclipse.osee.ats.editor.service.branch.ShowChangeReportService">

       </AtsEditorToolbarService>

+      <AtsEditorToolbarService

+            classname="org.eclipse.osee.ats.editor.service.OpenInArtifactEditorOperation">

+      </AtsEditorToolbarService>

+      <AtsEditorToolbarService

+            classname="org.eclipse.osee.ats.editor.service.OpenParent">

+      </AtsEditorToolbarService>

+      <AtsEditorToolbarService

+            classname="org.eclipse.osee.ats.editor.service.OpenInSkyWalkerOperation">

+      </AtsEditorToolbarService>

+      <AtsEditorToolbarService

+            classname="org.eclipse.osee.ats.editor.service.OpenTeamDefinition">

+      </AtsEditorToolbarService>

+      <AtsEditorToolbarService

+            classname="org.eclipse.osee.ats.editor.service.EmailActionService">

+      </AtsEditorToolbarService>

+      <AtsEditorToolbarService

+            classname="org.eclipse.osee.ats.editor.service.AddNoteOperation">

+      </AtsEditorToolbarService>

+      <AtsEditorToolbarService

+            classname="org.eclipse.osee.ats.editor.service.ShowNotesOperation">

+      </AtsEditorToolbarService>

    </extension>

 

 

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/DecisionReviewArtifact.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/DecisionReviewArtifact.java
index fb74adad353..9b129f1476e 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/DecisionReviewArtifact.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/DecisionReviewArtifact.java
@@ -18,6 +18,7 @@ import java.util.Set;
 import org.eclipse.osee.ats.AtsPlugin;
 import org.eclipse.osee.ats.util.widgets.SMAState;
 import org.eclipse.osee.ats.util.widgets.XDecisionOptions;
+import org.eclipse.osee.ats.workflow.AtsWorkPage;
 import org.eclipse.osee.ats.world.IWorldViewArtifact;
 import org.eclipse.osee.framework.skynet.core.SkynetAuthentication;
 import org.eclipse.osee.framework.skynet.core.User;
@@ -66,6 +67,18 @@ public class DecisionReviewArtifact extends ReviewSMArtifact implements IReviewA
       }
    }
 
+   /* (non-Javadoc)
+    * @see org.eclipse.osee.ats.artifact.StateMachineArtifact#isCurrentSectionExpanded(org.eclipse.osee.ats.workflow.AtsWorkPage)
+    */
+   @Override
+   public boolean isCurrentSectionExpanded(AtsWorkPage page) {
+      // Always expand the decision state
+      if (page.getName().endsWith(StateNames.Decision.name())) return true;
+      // If current state is decision and this is prepare state, don't expand the Prepare state
+      if (getCurrentStateName().equals(StateNames.Decision.name()) && page.getName().contains(StateNames.Prepare.name())) return false;
+      return super.isCurrentSectionExpanded(page);
+   }
+
    @Override
    public String getHelpContext() {
       return "decisionReview";
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java
index acf58da32b0..dc4ee8da4a8 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java
@@ -127,6 +127,16 @@ public abstract class StateMachineArtifact extends ATSArtifact implements IEvent
       notifyOriginatorAndReset();
    }
 
+   /**
+    * Override to apply different algorithm to current section expansion.
+    * 
+    * @param page
+    * @return true if section should be expanded
+    */
+   public boolean isCurrentSectionExpanded(AtsWorkPage page) {
+      return smaMgr.isCurrentState(page);
+   }
+
    public void notifyNewAssigneesAndReset() {
       Set<User> newAssignees = new HashSet<User>();
       for (User user : smaMgr.getAssignees()) {
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAManager.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAManager.java
index 645813f05f8..9835887f36a 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAManager.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAManager.java
@@ -665,6 +665,10 @@ public class SMAManager {
       return (getCurrentStateName().equals(DefaultTeamState.Cancelled.name()));
    }
 
+   public boolean isCurrentSectionExpanded(AtsWorkPage page) {
+      return sma.isCurrentSectionExpanded(page);
+   }
+
    public boolean isCurrentState(WorkPage page) {
       return sma.getCurrentStateDam().getState(page.getName(), false) != null;
    }
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMARelationsComposite.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMARelationsComposite.java
index ade67ae5fb6..4dfadf35953 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMARelationsComposite.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMARelationsComposite.java
@@ -12,18 +12,24 @@
 package org.eclipse.osee.ats.editor;
 
 import java.sql.SQLException;
+import org.eclipse.osee.ats.AtsPlugin;
+import org.eclipse.osee.ats.artifact.ReviewSMArtifact;
 import org.eclipse.osee.ats.artifact.StateMachineArtifact;
 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.util.AtsLib;
+import org.eclipse.osee.ats.util.widgets.dialog.AICheckTreeDialog;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+import org.eclipse.osee.framework.skynet.core.artifact.search.Active;
 import org.eclipse.osee.framework.skynet.core.relation.IRelationLink;
 import org.eclipse.osee.framework.skynet.core.relation.RelationSide;
 import org.eclipse.osee.framework.ui.plugin.util.ALayout;
 import org.eclipse.osee.framework.ui.skynet.XFormToolkit;
 import org.eclipse.osee.framework.ui.skynet.ats.AtsOpenOption;
+import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
 import org.eclipse.ui.forms.events.HyperlinkEvent;
 import org.eclipse.ui.forms.events.IHyperlinkListener;
 import org.eclipse.ui.forms.widgets.Hyperlink;
@@ -35,9 +41,11 @@ public class SMARelationsComposite extends Composite {
 
    private final XFormToolkit toolkit;
    private static RelationSide sides[] =
-         new RelationSide[] {RelationSide.TeamWorkflowToReview_Review, RelationSide.Supercedes_Superceded,
-               RelationSide.Supercedes_Supercedes, RelationSide.SupportingInfo_SupportedBy,
-               RelationSide.SupportingInfo_SupportingInfo};
+         new RelationSide[] {RelationSide.TeamWorkflowToReview_Review, RelationSide.TeamWorkflowToReview_Team,
+               RelationSide.Supercedes_Superceded, RelationSide.Supercedes_Supercedes,
+               RelationSide.SupportingInfo_SupportedBy, RelationSide.SupportingInfo_SupportingInfo};
+   private SMAManager smaMgr;
+   private Label actionableItemsLabel;
 
    /**
     * @param parent
@@ -49,6 +57,7 @@ public class SMARelationsComposite extends Composite {
    }
 
    public void create(SMAManager smaMgr) {
+      this.smaMgr = smaMgr;
       try {
          setLayout(ALayout.getZeroMarginLayout(2, false));
          GridData gd = new GridData(GridData.FILL_BOTH);
@@ -57,6 +66,7 @@ public class SMARelationsComposite extends Composite {
          toolkit.adapt(this);
 
          processArtifact("This", smaMgr.getSma());
+         if (smaMgr.getSma() instanceof ReviewSMArtifact) processReviewArtifact((ReviewSMArtifact) smaMgr.getSma());
 
          if ((smaMgr.getSma() instanceof TeamWorkFlowArtifact) && ((TeamWorkFlowArtifact) smaMgr.getSma()).getParentActionArtifact() != null) {
             processArtifact("Parent ", ((TeamWorkFlowArtifact) smaMgr.getSma()).getParentActionArtifact());
@@ -71,10 +81,11 @@ public class SMARelationsComposite extends Composite {
          if (smaArt.getArtifacts(side).size() > 0) return true;
          if (smaArt.getParentActionArtifact() != null && smaArt.getParentActionArtifact().getArtifacts(side).size() > 0) return true;
       }
+      if ((smaArt instanceof ReviewSMArtifact) && ((ReviewSMArtifact) smaArt).getActionableItemsDam().getActionableItemGuids().size() > 0) return true;
       return false;
    }
 
-   public void processArtifact(String name, Artifact thisArt) throws SQLException {
+   private void processArtifact(String name, Artifact thisArt) throws SQLException {
       for (RelationSide side : sides) {
          for (final Artifact art : thisArt.getArtifacts(side)) {
             IRelationLink rel = thisArt.getRelations(art).iterator().next();
@@ -85,10 +96,9 @@ public class SMARelationsComposite extends Composite {
                   toolkit.createHyperlink(
                         this,
                         String.format(
-                              "%s - %s",
-                              art.getHumanReadableId(),
+                              "\"%s\" - %s",
                               art.getDescriptiveName().length() < 60 ? art.getDescriptiveName() : art.getDescriptiveName().substring(
-                                    0, 60)), SWT.NONE);
+                                    0, 60), art.getHumanReadableId()), SWT.NONE);
             link.addHyperlinkListener(new IHyperlinkListener() {
 
                public void linkEntered(HyperlinkEvent e) {
@@ -104,4 +114,46 @@ public class SMARelationsComposite extends Composite {
          }
       }
    }
+
+   private void processReviewArtifact(final ReviewSMArtifact reviewArt) throws SQLException {
+      if (reviewArt.getActionableItemsDam().getActionableItemGuids().size() == 0) return;
+      actionableItemsLabel = toolkit.createLabel(this, "");
+      Hyperlink link = toolkit.createHyperlink(this, "(Edit)", SWT.NONE);
+      link.addHyperlinkListener(new IHyperlinkListener() {
+
+         public void linkEntered(HyperlinkEvent e) {
+         }
+
+         public void linkExited(HyperlinkEvent e) {
+         }
+
+         public void linkActivated(HyperlinkEvent e) {
+            editRelatedActionableItems(reviewArt);
+         }
+      });
+      refreshActionableItemsLabel();
+   }
+
+   private void refreshActionableItemsLabel() {
+      if (smaMgr.getSma() instanceof ReviewSMArtifact) actionableItemsLabel.setText("This \"" + ((ReviewSMArtifact) smaMgr.getSma()).getArtifactTypeName() + "\" is review of Actionable Items  \"" + ((ReviewSMArtifact) smaMgr.getSma()).getActionableItemsDam().getActionableItemsStr() + "\" ");
+   }
+
+   public void refresh() {
+      refreshActionableItemsLabel();
+   }
+
+   private void editRelatedActionableItems(final ReviewSMArtifact reviewArt) {
+      final AICheckTreeDialog diag =
+            new AICheckTreeDialog("Edit Actionable Items", "Select Actionable Items for this review", Active.Active);
+      try {
+         diag.setInitialSelections(reviewArt.getActionableItemsDam().getActionableItems().toArray());
+         if (diag.open() != 0) return;
+         reviewArt.getActionableItemsDam().setActionableItems(diag.getSelection());
+         smaMgr.getEditor().onDirtied();
+         refreshActionableItemsLabel();
+      } catch (Exception ex) {
+         OSEELog.logException(AtsPlugin.class, ex, true);
+      }
+
+   }
 }
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowSection.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowSection.java
index 4fa831dedd6..8e6cf4d8c7c 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowSection.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowSection.java
@@ -99,7 +99,7 @@ public class SMAWorkFlowSection extends SectionPart {
       Section section = toolkit.createSection(comp, Section.TWISTIE | Section.TITLE_BAR);
       section.setText(getCurrentStateTitle());
       if (smaMgr.isCurrentState(page)) section.setBackground(AtsPlugin.ACTIVE_COLOR);
-      section.setExpanded(smaMgr.isCurrentState(page) || smaMgr.isFirstState(page));
+      section.setExpanded(smaMgr.isCurrentSectionExpanded(page));
       section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
       // section.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_MAGENTA));
 
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java
index 822af1f735f..b27335e37cd 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java
@@ -69,6 +69,7 @@ public class SMAWorkFlowTab extends FormPage implements IActionable {
    private Integer HEADER_COMP_COLUMNS = 4;
    private static Map<String, Integer> guidToScrollLocation = new HashMap<String, Integer>();
    private final TeamWorkFlowArtifact teamWf;
+   private SMARelationsComposite smaRelationsComposite;
 
    public SMAWorkFlowTab(SMAManager smaMgr) {
       super(smaMgr.getEditor(), "overview", "Workflow");
@@ -175,8 +176,8 @@ public class SMAWorkFlowTab extends FormPage implements IActionable {
       // Display relations
       try {
          if (SMARelationsComposite.relationExists(smaMgr.getSma())) {
-            SMARelationsComposite comp = new SMARelationsComposite(body, toolkit, SWT.NONE);
-            comp.create(smaMgr);
+            smaRelationsComposite = new SMARelationsComposite(body, toolkit, SWT.NONE);
+            smaRelationsComposite.create(smaMgr);
          }
       } catch (SQLException ex) {
          OSEELog.logException(AtsPlugin.class, ex, false);
@@ -458,6 +459,7 @@ public class SMAWorkFlowTab extends FormPage implements IActionable {
    public void refresh() {
       for (SMAWorkFlowSection section : sections)
          section.refresh();
+      if (smaRelationsComposite != null) smaRelationsComposite.refresh();
    }
 
 }
\ No newline at end of file
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/AddDecisionReviewService.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/AddDecisionReviewService.java
index 34ff88ede1b..4d09a258ecb 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/AddDecisionReviewService.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/AddDecisionReviewService.java
@@ -33,7 +33,8 @@ public class AddDecisionReviewService extends WorkPageService {
    private Hyperlink link;
 
    public AddDecisionReviewService(SMAManager smaMgr, AtsWorkPage page, XFormToolkit toolkit, SMAWorkFlowSection section) {
-      super("Add Decision Review", smaMgr, page, toolkit, section, ServicesArea.OPERATION_CATEGORY, Location.Global);
+      super("Add Decision Review", smaMgr, page, toolkit, section, ServicesArea.OPERATION_CATEGORY,
+            Location.CurrentState);
    }
 
    @Override
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/AddNoteOperation.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/AddNoteOperation.java
index 063f0b47163..7ec85df361b 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/AddNoteOperation.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/AddNoteOperation.java
@@ -12,72 +12,43 @@
 package org.eclipse.osee.ats.editor.service;
 
 import java.util.ArrayList;
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.osee.ats.AtsPlugin;
 import org.eclipse.osee.ats.actions.wizard.NewNoteWizard;
 import org.eclipse.osee.ats.editor.SMAManager;
 import org.eclipse.osee.ats.editor.SMAWorkFlowSection;
+import org.eclipse.osee.ats.editor.toolbar.IAtsEditorToolBarService;
 import org.eclipse.osee.ats.util.DefaultTeamState;
 import org.eclipse.osee.ats.workflow.AtsWorkPage;
 import org.eclipse.osee.framework.skynet.core.SkynetAuthentication;
 import org.eclipse.osee.framework.ui.skynet.XFormToolkit;
 import org.eclipse.osee.framework.ui.skynet.ats.NoteType;
+import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
 import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPage;
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Group;
 import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.Hyperlink;
 
 /**
  * @author Donald G. Dunne
  */
-public class AddNoteOperation extends WorkPageService {
+public class AddNoteOperation extends WorkPageService implements IAtsEditorToolBarService {
 
-   private final SMAManager smaMgr;
-   private Hyperlink link;
+   Action action;
 
-   public AddNoteOperation(SMAManager smaMgr, AtsWorkPage page, XFormToolkit toolkit, SMAWorkFlowSection section) {
-      super("Add Note", smaMgr, page, toolkit, section, ServicesArea.OPERATION_CATEGORY, Location.Global);
-      this.smaMgr = smaMgr;
+   public AddNoteOperation(final SMAManager smaMgr, AtsWorkPage page, XFormToolkit toolkit, SMAWorkFlowSection section) {
+      super("Add Note", smaMgr, page, toolkit, section, null, Location.None);
+   }
+
+   /*
+    * This constructor is used for the toolbar service extension
+    */
+   public AddNoteOperation(final SMAManager smaMgr) {
+      super("Add Note", smaMgr, null, null, null, null, null);
    }
 
    @Override
    public void create(Group workComp) {
-      link = toolkit.createHyperlink(workComp, name, SWT.NONE);
-      if (smaMgr.getSma().isReadOnly())
-         link.addHyperlinkListener(readOnlyHyperlinkListener);
-      else
-         link.addHyperlinkListener(new IHyperlinkListener() {
-
-            public void linkEntered(HyperlinkEvent e) {
-            }
-
-            public void linkExited(HyperlinkEvent e) {
-            }
-
-            public void linkActivated(HyperlinkEvent e) {
-               ArrayList<String> artifactNames = new ArrayList<String>();
-               artifactNames.add(smaMgr.getSma().getDescriptiveName() + " - " + smaMgr.getSma().getDescriptiveName());
-               for (WorkPage page : smaMgr.getWorkFlow().getPages())
-                  if (!page.equals(DefaultTeamState.Cancelled.name()) && !page.equals(DefaultTeamState.Completed.name())) artifactNames.add(page.getName());
-               NewNoteWizard noteWizard = new NewNoteWizard(artifactNames);
-               WizardDialog dialog =
-                     new WizardDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), noteWizard);
-               dialog.create();
-               if (dialog.open() == 0) {
-                  String selected = noteWizard.mainPage.artifactList.getSelected().iterator().next().getName();
-                  String state = "";
-                  if (!selected.startsWith(smaMgr.getSma().getDescriptiveName() + " - ")) state = selected;
-                  smaMgr.getSma().getNotes().addNote(
-                        NoteType.getType(noteWizard.mainPage.typeList.getSelected().iterator().next().getName()),
-                        state, noteWizard.mainPage.noteText.get(),
-                        SkynetAuthentication.getInstance().getAuthenticatedUser());
-                  smaMgr.getEditor().onDirtied();
-               }
-            }
-         });
-      refresh();
    }
 
    /*
@@ -98,4 +69,55 @@ public class AddNoteOperation extends WorkPageService {
    public void dispose() {
    }
 
+   private void performAddNote() {
+      try {
+         ArrayList<String> artifactNames = new ArrayList<String>();
+         artifactNames.add(smaMgr.getSma().getDescriptiveName() + " - " + smaMgr.getSma().getDescriptiveName());
+         for (WorkPage page : smaMgr.getWorkFlow().getPages())
+            if (!page.equals(DefaultTeamState.Cancelled.name()) && !page.equals(DefaultTeamState.Completed.name())) artifactNames.add(page.getName());
+         NewNoteWizard noteWizard = new NewNoteWizard(artifactNames);
+         WizardDialog dialog =
+               new WizardDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), noteWizard);
+         dialog.create();
+         if (dialog.open() == 0) {
+            String selected = noteWizard.mainPage.artifactList.getSelected().iterator().next().getName();
+            String state = "";
+            if (!selected.startsWith(smaMgr.getSma().getDescriptiveName() + " - ")) state = selected;
+            smaMgr.getSma().getNotes().addNote(
+                  NoteType.getType(noteWizard.mainPage.typeList.getSelected().iterator().next().getName()), state,
+                  noteWizard.mainPage.noteText.get(), SkynetAuthentication.getInstance().getAuthenticatedUser());
+            smaMgr.getEditor().onDirtied();
+         }
+      } catch (Exception ex) {
+         OSEELog.logException(AtsPlugin.class, ex, true);
+      }
+   }
+
+   /* (non-Javadoc)
+    * @see org.eclipse.osee.ats.editor.toolbar.IAtsEditorToolBarService#getToolbarAction(org.eclipse.osee.ats.editor.SMAManager)
+    */
+   public Action getToolbarAction(SMAManager smaMgr) {
+      action = new Action(getName(), Action.AS_PUSH_BUTTON) {
+         public void run() {
+            performAddNote();
+         }
+      };
+      action.setToolTipText(getName());
+      action.setImageDescriptor(AtsPlugin.getInstance().getImageDescriptor("note.gif"));
+      return action;
+   }
+
+   /* (non-Javadoc)
+    * @see org.eclipse.osee.ats.editor.toolbar.IAtsEditorToolBarService#refreshToolbarAction()
+    */
+   public void refreshToolbarAction() {
+      action.setEnabled(smaMgr.getSma().isReadOnly());
+   }
+
+   /* (non-Javadoc)
+    * @see org.eclipse.osee.ats.editor.toolbar.IAtsEditorToolBarService#showInToolbar(org.eclipse.osee.ats.editor.SMAManager)
+    */
+   public boolean showInToolbar(SMAManager smaMgr) {
+      return true;
+   }
 }
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/AddPeerToPeerReviewService.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/AddPeerToPeerReviewService.java
index 95a7c4cd2f8..18ca301947e 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/AddPeerToPeerReviewService.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/AddPeerToPeerReviewService.java
@@ -34,7 +34,8 @@ public class AddPeerToPeerReviewService extends WorkPageService {
    private Hyperlink link;
 
    public AddPeerToPeerReviewService(SMAManager smaMgr, AtsWorkPage page, XFormToolkit toolkit, SMAWorkFlowSection section) {
-      super("Add PeerToPeer Review", smaMgr, page, toolkit, section, ServicesArea.OPERATION_CATEGORY, Location.Global);
+      super("Add PeerToPeer Review", smaMgr, page, toolkit, section, ServicesArea.OPERATION_CATEGORY,
+            Location.CurrentState);
    }
 
    @Override
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/AtsAdminStat.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/AtsAdminStat.java
index c273193a0bb..7a21959c79b 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/AtsAdminStat.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/AtsAdminStat.java
@@ -28,7 +28,7 @@ public class AtsAdminStat extends WorkPageService {
    private Label label;
 
    public AtsAdminStat(SMAManager smaMgr, AtsWorkPage page, XFormToolkit toolkit, SMAWorkFlowSection section) {
-      super("AtsAdmin", smaMgr, page, toolkit, section, ServicesArea.ADMIN_CATEGORY, Location.Global);
+      super("AtsAdmin", smaMgr, page, toolkit, section, ServicesArea.STATISTIC_CATEGORY, Location.CurrentState);
    }
 
    @Override
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/BlockingReview.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/BlockingReview.java
index 1cbf0959fd1..927a6508018 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/BlockingReview.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/BlockingReview.java
@@ -12,7 +12,6 @@ package org.eclipse.osee.ats.editor.service;
 
 import java.sql.SQLException;
 import org.eclipse.osee.ats.AtsPlugin;
-import org.eclipse.osee.ats.artifact.ActionableItemArtifact;
 import org.eclipse.osee.ats.artifact.ReviewSMArtifact;
 import org.eclipse.osee.ats.editor.SMAManager;
 import org.eclipse.osee.ats.editor.SMAWorkFlowSection;
@@ -32,7 +31,8 @@ public class BlockingReview extends WorkPageService {
    private Label label;
 
    public BlockingReview(SMAManager smaMgr, AtsWorkPage page, XFormToolkit toolkit, SMAWorkFlowSection section) {
-      super("Blocking Review", smaMgr, page, toolkit, section, ServicesArea.STATISTIC_CATEGORY, Location.Global);
+      super("Blocking Review", smaMgr, page, toolkit, section, ServicesArea.STATISTIC_CATEGORY,
+            Location.AllNonCompleteState);
    }
 
    @Override
@@ -48,17 +48,8 @@ public class BlockingReview extends WorkPageService {
    @Override
    public void create(Group workComp) {
       if (!(smaMgr.getSma() instanceof ReviewSMArtifact)) return;
-      try {
-         if (smaMgr.getSma().getParentSMA() == null) {
-            StringBuffer sb = new StringBuffer("Stand-alone Review");
-            for (ActionableItemArtifact aia : ((ReviewSMArtifact) smaMgr.getSma()).getActionableItemsDam().getActionableItems())
-               sb.append("\n - " + aia.getDescriptiveName());
-            toolkit.createLabel(workComp, name, SWT.None).setText(sb.toString());
-         } else
-            label = toolkit.createLabel(workComp, "");
-      } catch (SQLException ex) {
-         return;
-      }
+      label = toolkit.createLabel(workComp, "");
+      label.setToolTipText("A blocking review requires the review be completed before the parent workflow can continue.");
       refresh();
    }
 
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/EmailActionService.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/EmailActionService.java
index d194793a721..281596c2cca 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/EmailActionService.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/EmailActionService.java
@@ -10,48 +10,43 @@
  *******************************************************************************/
 package org.eclipse.osee.ats.editor.service;
 
+import org.eclipse.jface.action.Action;
 import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.osee.ats.AtsPlugin;
 import org.eclipse.osee.ats.editor.SMAManager;
 import org.eclipse.osee.ats.editor.SMAWorkFlowSection;
+import org.eclipse.osee.ats.editor.toolbar.IAtsEditorToolBarService;
 import org.eclipse.osee.ats.util.ArtifactEmailWizard;
 import org.eclipse.osee.ats.workflow.AtsWorkPage;
 import org.eclipse.osee.framework.ui.skynet.XFormToolkit;
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Group;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.Hyperlink;
 
 /**
  * @author Donald G. Dunne
  */
-public class EmailActionService extends WorkPageService {
+public class EmailActionService extends WorkPageService implements IAtsEditorToolBarService {
 
    public EmailActionService(final SMAManager smaMgr, AtsWorkPage page, XFormToolkit toolkit, SMAWorkFlowSection section) {
-      super("Email " + smaMgr.getSma().getArtifactSuperTypeName(), smaMgr, page, toolkit, section,
-            ServicesArea.OPERATION_CATEGORY, Location.Global);
+      super("Email " + smaMgr.getSma().getArtifactSuperTypeName(), smaMgr, page, toolkit, section, null, Location.None);
+   }
+
+   /*
+    * This constructor is used for the toolbar service extension
+    */
+   public EmailActionService(final SMAManager smaMgr) {
+      super("Email " + smaMgr.getSma().getArtifactSuperTypeName(), smaMgr, null, null, null, null, null);
    }
 
    @Override
    public void create(Group workComp) {
-      Hyperlink link = toolkit.createHyperlink(workComp, name, SWT.NONE);
-      link.addHyperlinkListener(new IHyperlinkListener() {
-
-         public void linkEntered(HyperlinkEvent e) {
-         }
-
-         public void linkExited(HyperlinkEvent e) {
-         }
-
-         public void linkActivated(HyperlinkEvent e) {
-            ArtifactEmailWizard ew = new ArtifactEmailWizard(smaMgr.getSma());
-            WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), ew);
-            dialog.create();
-            dialog.open();
-         }
+   }
 
-      });
+   private void performEmail() {
+      ArtifactEmailWizard ew = new ArtifactEmailWizard(smaMgr.getSma());
+      WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), ew);
+      dialog.create();
+      dialog.open();
    }
 
    /*
@@ -72,4 +67,30 @@ public class EmailActionService extends WorkPageService {
    public void dispose() {
    }
 
+   /* (non-Javadoc)
+    * @see org.eclipse.osee.ats.editor.toolbar.IAtsEditorToolBarService#getToolbarAction(org.eclipse.osee.ats.editor.SMAManager)
+    */
+   public Action getToolbarAction(SMAManager smaMgr) {
+      Action action = new Action(getName(), Action.AS_PUSH_BUTTON) {
+         public void run() {
+            performEmail();
+         }
+      };
+      action.setToolTipText(getName());
+      action.setImageDescriptor(AtsPlugin.getInstance().getImageDescriptor("email.gif"));
+      return action;
+   }
+
+   /* (non-Javadoc)
+    * @see org.eclipse.osee.ats.editor.toolbar.IAtsEditorToolBarService#refreshToolbarAction()
+    */
+   public void refreshToolbarAction() {
+   }
+
+   /* (non-Javadoc)
+    * @see org.eclipse.osee.ats.editor.toolbar.IAtsEditorToolBarService#showInToolbar(org.eclipse.osee.ats.editor.SMAManager)
+    */
+   public boolean showInToolbar(SMAManager smaMgr) {
+      return true;
+   }
 }
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/FavoriteOperation.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/FavoriteOperation.java
index 267c97bb238..27704fc9089 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/FavoriteOperation.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/FavoriteOperation.java
@@ -31,7 +31,7 @@ public class FavoriteOperation extends WorkPageService {
    private Hyperlink link;
 
    public FavoriteOperation(SMAManager smaMgr, AtsWorkPage page, XFormToolkit toolkit, SMAWorkFlowSection section) {
-      super("Favorite", smaMgr, page, toolkit, section, ServicesArea.OPERATION_CATEGORY, Location.Global);
+      super("Favorite", smaMgr, page, toolkit, section, ServicesArea.OPERATION_CATEGORY, Location.CurrentState);
       this.smaMgr = smaMgr;
    }
 
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/HridStat.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/HridStat.java
index 2de526243c8..526414fe488 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/HridStat.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/HridStat.java
@@ -28,7 +28,7 @@ import org.eclipse.swt.widgets.Text;
 public class HridStat extends WorkPageService {
 
    public HridStat(SMAManager smaMgr, AtsWorkPage page, XFormToolkit toolkit, SMAWorkFlowSection section) {
-      super("", smaMgr, page, toolkit, section, ServicesArea.STATISTIC_CATEGORY, Location.Global);
+      super("", smaMgr, page, toolkit, section, ServicesArea.STATISTIC_CATEGORY, Location.CurrentState);
    }
 
    /*
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenHeadVersion.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenHeadVersion.java
deleted file mode 100644
index fc1ae4d949b..00000000000
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenHeadVersion.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.editor.service;
-
-import java.sql.SQLException;
-import org.eclipse.osee.ats.editor.SMAManager;
-import org.eclipse.osee.ats.editor.SMAWorkFlowSection;
-import org.eclipse.osee.ats.util.AtsLib;
-import org.eclipse.osee.ats.workflow.AtsWorkPage;
-import org.eclipse.osee.framework.ui.skynet.XFormToolkit;
-import org.eclipse.osee.framework.ui.skynet.ats.AtsOpenOption;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.Hyperlink;
-
-/**
- * @author Donald G. Dunne
- */
-public class OpenHeadVersion extends WorkPageService {
-
-   private final SMAManager smaMgr;
-   private Hyperlink link;
-
-   public OpenHeadVersion(SMAManager smaMgr, AtsWorkPage page, XFormToolkit toolkit, SMAWorkFlowSection section) {
-      super("Open Latest", smaMgr, page, toolkit, section, ServicesArea.OPERATION_CATEGORY, Location.Global);
-      this.smaMgr = smaMgr;
-   }
-
-   @Override
-   public void create(Group workComp) {
-      try {
-         if (smaMgr.getSma().getParentSMA() == null) return;
-      } catch (SQLException ex) {
-         return;
-      }
-      link = toolkit.createHyperlink(workComp, name, SWT.NONE);
-      link.addHyperlinkListener(new IHyperlinkListener() {
-
-         public void linkEntered(HyperlinkEvent e) {
-         }
-
-         public void linkExited(HyperlinkEvent e) {
-         }
-
-         public void linkActivated(HyperlinkEvent e) {
-            try {
-               AtsLib.openAtsAction(smaMgr.getSma().getParentSMA(), AtsOpenOption.OpenOneOrPopupSelect);
-            } catch (SQLException ex) {
-               // Do Nothing
-            }
-         }
-      });
-      refresh();
-   }
-
-   /*
-    * (non-Javadoc)
-    * 
-    * @see org.eclipse.osee.ats.editor.operation.WorkPageService#refresh()
-    */
-   @Override
-   public void refresh() {
-   }
-
-   /*
-    * (non-Javadoc)
-    * 
-    * @see org.eclipse.osee.ats.editor.service.WorkPageService#dispose()
-    */
-   @Override
-   public void dispose() {
-   }
-}
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenInArtifactEditorOperation.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenInArtifactEditorOperation.java
index 011ec24039a..5eda6c0b6d0 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenInArtifactEditorOperation.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenInArtifactEditorOperation.java
@@ -10,10 +10,13 @@
  *******************************************************************************/
 package org.eclipse.osee.ats.editor.service;
 
+import org.eclipse.jface.action.Action;
 import org.eclipse.osee.ats.AtsPlugin;
 import org.eclipse.osee.ats.editor.SMAManager;
 import org.eclipse.osee.ats.editor.SMAWorkFlowSection;
+import org.eclipse.osee.ats.editor.toolbar.IAtsEditorToolBarService;
 import org.eclipse.osee.ats.workflow.AtsWorkPage;
+import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
 import org.eclipse.osee.framework.ui.skynet.XFormToolkit;
 import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor;
 import org.eclipse.swt.SWT;
@@ -25,10 +28,17 @@ import org.eclipse.ui.forms.widgets.Hyperlink;
 /**
  * @author Donald G. Dunne
  */
-public class OpenInArtifactEditorOperation extends WorkPageService {
+public class OpenInArtifactEditorOperation extends WorkPageService implements IAtsEditorToolBarService {
 
    public OpenInArtifactEditorOperation(SMAManager smaMgr, AtsWorkPage page, XFormToolkit toolkit, SMAWorkFlowSection section) {
-      super("Open Artifact Editor", smaMgr, page, toolkit, section, ServicesArea.ADMIN_CATEGORY, Location.Global);
+      super("Open Artifact Editor", smaMgr, page, toolkit, section, null, Location.None);
+   }
+
+   /*
+    * This constructor is used for the toolbar service extension
+    */
+   public OpenInArtifactEditorOperation(SMAManager smaMgr) {
+      super("Open Artifact Editor", smaMgr, null, null, null, null, null);
    }
 
    @Override
@@ -48,7 +58,7 @@ public class OpenInArtifactEditorOperation extends WorkPageService {
          }
 
          public void linkActivated(HyperlinkEvent e) {
-            ArtifactEditor.editArtifact(smaMgr.getSma());
+            performOpen();
          }
 
       });
@@ -70,4 +80,35 @@ public class OpenInArtifactEditorOperation extends WorkPageService {
    public void dispose() {
    }
 
+   private void performOpen() {
+      ArtifactEditor.editArtifact(smaMgr.getSma());
+   }
+
+   /* (non-Javadoc)
+    * @see org.eclipse.osee.ats.editor.toolbar.IAtsEditorToolBarService#getToolbarAction(org.eclipse.osee.ats.editor.SMAManager)
+    */
+   public Action getToolbarAction(SMAManager smaMgr) {
+      Action action = new Action(getName(), Action.AS_PUSH_BUTTON) {
+         public void run() {
+            performOpen();
+         }
+      };
+      action.setToolTipText(getName());
+      action.setImageDescriptor(SkynetGuiPlugin.getInstance().getImageDescriptor("laser_16_16.gif"));
+      return action;
+   }
+
+   /* (non-Javadoc)
+    * @see org.eclipse.osee.ats.editor.toolbar.IAtsEditorToolBarService#refreshToolbarAction()
+    */
+   public void refreshToolbarAction() {
+   }
+
+   /* (non-Javadoc)
+    * @see org.eclipse.osee.ats.editor.toolbar.IAtsEditorToolBarService#showInToolbar(org.eclipse.osee.ats.editor.SMAManager)
+    */
+   public boolean showInToolbar(SMAManager smaMgr) {
+      return AtsPlugin.isAtsAdmin();
+   }
+
 }
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenInAtsWorldOperation.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenInAtsWorldOperation.java
index a8cae9dd27e..b3388a6f30b 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenInAtsWorldOperation.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenInAtsWorldOperation.java
@@ -37,7 +37,7 @@ import org.eclipse.ui.forms.widgets.Hyperlink;
 public class OpenInAtsWorldOperation extends WorkPageService implements IAtsEditorToolBarService {
 
    public OpenInAtsWorldOperation(SMAManager smaMgr, AtsWorkPage page, XFormToolkit toolkit, SMAWorkFlowSection section) {
-      super("Open in ATS World", smaMgr, page, toolkit, section, ServicesArea.OPERATION_CATEGORY, Location.Global);
+      super("Open in ATS World", smaMgr, page, toolkit, section, null, Location.None);
    }
 
    /*
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenInSkyWalkerOperation.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenInSkyWalkerOperation.java
index 06f4108901c..d71773275ad 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenInSkyWalkerOperation.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenInSkyWalkerOperation.java
@@ -10,48 +10,34 @@
  *******************************************************************************/
 package org.eclipse.osee.ats.editor.service;
 
-import org.eclipse.osee.ats.AtsPlugin;
+import org.eclipse.jface.action.Action;
 import org.eclipse.osee.ats.editor.SMAManager;
 import org.eclipse.osee.ats.editor.SMAWorkFlowSection;
+import org.eclipse.osee.ats.editor.toolbar.IAtsEditorToolBarService;
 import org.eclipse.osee.ats.workflow.AtsWorkPage;
+import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
 import org.eclipse.osee.framework.ui.skynet.XFormToolkit;
 import org.eclipse.osee.framework.ui.skynet.skywalker.SkyWalkerView;
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Group;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.Hyperlink;
 
 /**
  * @author Donald G. Dunne
  */
-public class OpenInSkyWalkerOperation extends WorkPageService {
+public class OpenInSkyWalkerOperation extends WorkPageService implements IAtsEditorToolBarService {
 
    public OpenInSkyWalkerOperation(SMAManager smaMgr, AtsWorkPage page, XFormToolkit toolkit, SMAWorkFlowSection section) {
-      super("Open Sky Walker", smaMgr, page, toolkit, section, ServicesArea.OPERATION_CATEGORY, Location.Global);
+      super("Open Sky Walker", smaMgr, page, toolkit, section, null, Location.None);
    }
 
-   @Override
-   public boolean displayService() {
-      return AtsPlugin.isAtsAdmin();
+   /*
+    * This constructor is used for the toolbar service extension
+    */
+   public OpenInSkyWalkerOperation(SMAManager smaMgr) {
+      super("Open Sky Walker", smaMgr, null, null, null, null, null);
    }
 
    @Override
    public void create(Group workComp) {
-      Hyperlink link = toolkit.createHyperlink(workComp, name, SWT.NONE);
-      link.addHyperlinkListener(new IHyperlinkListener() {
-
-         public void linkEntered(HyperlinkEvent e) {
-         }
-
-         public void linkExited(HyperlinkEvent e) {
-         }
-
-         public void linkActivated(HyperlinkEvent e) {
-            SkyWalkerView.exploreArtifact(smaMgr.getSma());
-         }
-
-      });
    }
 
    /* (non-Javadoc)
@@ -70,4 +56,34 @@ public class OpenInSkyWalkerOperation extends WorkPageService {
    public void dispose() {
    }
 
+   private void performOpen() {
+      SkyWalkerView.exploreArtifact(smaMgr.getSma());
+   }
+
+   /* (non-Javadoc)
+    * @see org.eclipse.osee.ats.editor.toolbar.IAtsEditorToolBarService#getToolbarAction(org.eclipse.osee.ats.editor.SMAManager)
+    */
+   public Action getToolbarAction(SMAManager smaMgr) {
+      Action action = new Action(getName(), Action.AS_PUSH_BUTTON) {
+         public void run() {
+            performOpen();
+         }
+      };
+      action.setToolTipText(getName());
+      action.setImageDescriptor(SkynetGuiPlugin.getInstance().getImageDescriptor("skywalker.gif"));
+      return action;
+   }
+
+   /* (non-Javadoc)
+    * @see org.eclipse.osee.ats.editor.toolbar.IAtsEditorToolBarService#refreshToolbarAction()
+    */
+   public void refreshToolbarAction() {
+   }
+
+   /* (non-Javadoc)
+    * @see org.eclipse.osee.ats.editor.toolbar.IAtsEditorToolBarService#showInToolbar(org.eclipse.osee.ats.editor.SMAManager)
+    */
+   public boolean showInToolbar(SMAManager smaMgr) {
+      return true;
+   }
 }
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenLatestVersion.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenLatestVersion.java
index d18e9a65405..93138953c79 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenLatestVersion.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenLatestVersion.java
@@ -38,7 +38,7 @@ public class OpenLatestVersion extends WorkPageService {
    private Hyperlink link;
 
    public OpenLatestVersion(SMAManager smaMgr, AtsWorkPage page, XFormToolkit toolkit, SMAWorkFlowSection section) {
-      super("Open Latest", smaMgr, page, toolkit, section, ServicesArea.OPERATION_CATEGORY, Location.Global);
+      super("Open Latest", smaMgr, page, toolkit, section, ServicesArea.OPERATION_CATEGORY, Location.CurrentState);
       this.smaMgr = smaMgr;
    }
 
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenParent.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenParent.java
index fb7136defdb..9eb5d5eadb3 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenParent.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenParent.java
@@ -11,56 +11,40 @@
 package org.eclipse.osee.ats.editor.service;
 
 import java.sql.SQLException;
+import org.eclipse.jface.action.Action;
+import org.eclipse.osee.ats.AtsPlugin;
 import org.eclipse.osee.ats.editor.SMAManager;
 import org.eclipse.osee.ats.editor.SMAWorkFlowSection;
+import org.eclipse.osee.ats.editor.toolbar.IAtsEditorToolBarService;
 import org.eclipse.osee.ats.util.AtsLib;
 import org.eclipse.osee.ats.workflow.AtsWorkPage;
 import org.eclipse.osee.framework.ui.skynet.XFormToolkit;
 import org.eclipse.osee.framework.ui.skynet.ats.AtsOpenOption;
-import org.eclipse.swt.SWT;
+import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
 import org.eclipse.swt.widgets.Group;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.Hyperlink;
 
 /**
  * @author Donald G. Dunne
  */
-public class OpenParent extends WorkPageService {
+public class OpenParent extends WorkPageService implements IAtsEditorToolBarService {
 
    private final SMAManager smaMgr;
-   private Hyperlink link;
 
    public OpenParent(SMAManager smaMgr, AtsWorkPage page, XFormToolkit toolkit, SMAWorkFlowSection section) {
       super("Open Parent", smaMgr, page, toolkit, section, ServicesArea.OPERATION_CATEGORY, Location.Global);
       this.smaMgr = smaMgr;
    }
 
+   /*
+    * This constructor is used for the toolbar service extension
+    */
+   public OpenParent(SMAManager smaMgr) {
+      super("Open Parent", smaMgr, null, null, null, null, null);
+      this.smaMgr = smaMgr;
+   }
+
    @Override
    public void create(Group workComp) {
-      try {
-         if (smaMgr.getSma().getParentSMA() == null) return;
-      } catch (SQLException ex) {
-         return;
-      }
-      link = toolkit.createHyperlink(workComp, name, SWT.NONE);
-      link.addHyperlinkListener(new IHyperlinkListener() {
-
-         public void linkEntered(HyperlinkEvent e) {
-         }
-
-         public void linkExited(HyperlinkEvent e) {
-         }
-
-         public void linkActivated(HyperlinkEvent e) {
-            try {
-               AtsLib.openAtsAction(smaMgr.getSma().getParentSMA(), AtsOpenOption.OpenOneOrPopupSelect);
-            } catch (SQLException ex) {
-               // Do Nothing
-            }
-         }
-      });
-      refresh();
    }
 
    /*
@@ -80,4 +64,44 @@ public class OpenParent extends WorkPageService {
    @Override
    public void dispose() {
    }
+
+   private void performOpen() {
+      try {
+         AtsLib.openAtsAction(smaMgr.getSma().getParentSMA(), AtsOpenOption.OpenOneOrPopupSelect);
+      } catch (SQLException ex) {
+         // Do Nothing
+      }
+   }
+
+   /* (non-Javadoc)
+    * @see org.eclipse.osee.ats.editor.toolbar.IAtsEditorToolBarService#getToolbarAction(org.eclipse.osee.ats.editor.SMAManager)
+    */
+   public Action getToolbarAction(SMAManager smaMgr) {
+      Action action = new Action(getName(), Action.AS_PUSH_BUTTON) {
+         public void run() {
+            performOpen();
+         }
+      };
+      action.setToolTipText(getName());
+      action.setImageDescriptor(AtsPlugin.getInstance().getImageDescriptor("openParent.gif"));
+      return action;
+   }
+
+   /* (non-Javadoc)
+    * @see org.eclipse.osee.ats.editor.toolbar.IAtsEditorToolBarService#refreshToolbarAction()
+    */
+   public void refreshToolbarAction() {
+   }
+
+   /* (non-Javadoc)
+    * @see org.eclipse.osee.ats.editor.toolbar.IAtsEditorToolBarService#showInToolbar(org.eclipse.osee.ats.editor.SMAManager)
+    */
+   public boolean showInToolbar(SMAManager smaMgr) {
+      try {
+         return smaMgr.getSma().getParentSMA() != null;
+      } catch (Exception ex) {
+         OSEELog.logException(AtsPlugin.class, ex, false);
+      }
+      return false;
+   }
 }
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenTeamDefinition.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenTeamDefinition.java
index 2bee8f6fd6e..b1cb4e0eb92 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenTeamDefinition.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenTeamDefinition.java
@@ -12,54 +12,40 @@
 package org.eclipse.osee.ats.editor.service;
 
 import java.sql.SQLException;
+import org.eclipse.jface.action.Action;
+import org.eclipse.osee.ats.AtsPlugin;
 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.editor.SMAManager;
 import org.eclipse.osee.ats.editor.SMAWorkFlowSection;
+import org.eclipse.osee.ats.editor.toolbar.IAtsEditorToolBarService;
 import org.eclipse.osee.ats.util.AtsLib;
 import org.eclipse.osee.ats.workflow.AtsWorkPage;
 import org.eclipse.osee.framework.ui.skynet.XFormToolkit;
 import org.eclipse.osee.framework.ui.skynet.ats.AtsOpenOption;
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Group;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.Hyperlink;
 
 /**
  * @author Donald G. Dunne
  */
-public class OpenTeamDefinition extends WorkPageService {
+public class OpenTeamDefinition extends WorkPageService implements IAtsEditorToolBarService {
 
    private final SMAManager smaMgr;
-   private Hyperlink link;
 
    public OpenTeamDefinition(SMAManager smaMgr, AtsWorkPage page, XFormToolkit toolkit, SMAWorkFlowSection section) {
       super("Open Team Definition", smaMgr, page, toolkit, section, ServicesArea.OPERATION_CATEGORY, Location.Global);
       this.smaMgr = smaMgr;
    }
 
+   /*
+    * This constructor is used for the toolbar service extension
+    */
+   public OpenTeamDefinition(SMAManager smaMgr) {
+      super("Open Team Definition", smaMgr, null, null, null, null, null);
+      this.smaMgr = smaMgr;
+   }
+
    @Override
    public void create(Group workComp) {
-      if (!(smaMgr.getSma() instanceof TeamWorkFlowArtifact)) return;
-      link = toolkit.createHyperlink(workComp, name, SWT.NONE);
-      link.addHyperlinkListener(new IHyperlinkListener() {
-
-         public void linkEntered(HyperlinkEvent e) {
-         }
-
-         public void linkExited(HyperlinkEvent e) {
-         }
-
-         public void linkActivated(HyperlinkEvent e) {
-            try {
-               AtsLib.openAtsAction(((TeamWorkFlowArtifact) smaMgr.getSma()).getTeamDefinition(),
-                     AtsOpenOption.OpenOneOrPopupSelect);
-            } catch (SQLException ex) {
-               // Do Nothing
-            }
-         }
-      });
-      refresh();
    }
 
    /*
@@ -79,4 +65,40 @@ public class OpenTeamDefinition extends WorkPageService {
    @Override
    public void dispose() {
    }
+
+   private void performOpen() {
+      try {
+         AtsLib.openAtsAction(((TeamWorkFlowArtifact) smaMgr.getSma()).getTeamDefinition(),
+               AtsOpenOption.OpenOneOrPopupSelect);
+      } catch (SQLException ex) {
+         // Do Nothing
+      }
+   }
+
+   /* (non-Javadoc)
+    * @see org.eclipse.osee.ats.editor.toolbar.IAtsEditorToolBarService#getToolbarAction(org.eclipse.osee.ats.editor.SMAManager)
+    */
+   public Action getToolbarAction(SMAManager smaMgr) {
+      Action action = new Action(getName(), Action.AS_PUSH_BUTTON) {
+         public void run() {
+            performOpen();
+         }
+      };
+      action.setToolTipText(getName());
+      action.setImageDescriptor(AtsPlugin.getInstance().getImageDescriptor("team.gif"));
+      return action;
+   }
+
+   /* (non-Javadoc)
+    * @see org.eclipse.osee.ats.editor.toolbar.IAtsEditorToolBarService#refreshToolbarAction()
+    */
+   public void refreshToolbarAction() {
+   }
+
+   /* (non-Javadoc)
+    * @see org.eclipse.osee.ats.editor.toolbar.IAtsEditorToolBarService#showInToolbar(org.eclipse.osee.ats.editor.SMAManager)
+    */
+   public boolean showInToolbar(SMAManager smaMgr) {
+      return AtsPlugin.isAtsAdmin();
+   }
 }
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenVersionArtifact.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenVersionArtifact.java
new file mode 100644
index 00000000000..d98c438727d
--- /dev/null
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenVersionArtifact.java
@@ -0,0 +1,108 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2007 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.ats.editor.service;
+
+import java.sql.SQLException;
+import org.eclipse.jface.action.Action;
+import org.eclipse.osee.ats.AtsPlugin;
+import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
+import org.eclipse.osee.ats.editor.SMAManager;
+import org.eclipse.osee.ats.editor.SMAWorkFlowSection;
+import org.eclipse.osee.ats.editor.toolbar.IAtsEditorToolBarService;
+import org.eclipse.osee.ats.workflow.AtsWorkPage;
+import org.eclipse.osee.framework.ui.skynet.XFormToolkit;
+import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor;
+import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
+import org.eclipse.swt.widgets.Group;
+
+/**
+ * @author Donald G. Dunne
+ */
+public class OpenVersionArtifact extends WorkPageService implements IAtsEditorToolBarService {
+
+   Action action;
+
+   public OpenVersionArtifact(final SMAManager smaMgr, AtsWorkPage page, XFormToolkit toolkit, SMAWorkFlowSection section) {
+      super("Open Targeted for Version", smaMgr, page, toolkit, section, ServicesArea.OPERATION_CATEGORY,
+            Location.CurrentState);
+   }
+
+   /*
+    * This constructor is used for the toolbar service extension
+    */
+   public OpenVersionArtifact(final SMAManager smaMgr) {
+      super("Open Targeted for Version", smaMgr, null, null, null, null, null);
+   }
+
+   @Override
+   public void create(Group workComp) {
+   }
+
+   /*
+    * (non-Javadoc)
+    * 
+    * @see org.eclipse.osee.ats.editor.operation.WorkPageService#refresh()
+    */
+   @Override
+   public void refresh() {
+   }
+
+   /*
+    * (non-Javadoc)
+    * 
+    * @see org.eclipse.osee.ats.editor.service.WorkPageService#dispose()
+    */
+   @Override
+   public void dispose() {
+   }
+
+   private void performOpen() {
+      try {
+         if (((TeamWorkFlowArtifact) smaMgr.getSma()).getTargetedForVersion() != null) ArtifactEditor.editArtifact(((TeamWorkFlowArtifact) smaMgr.getSma()).getTargetedForVersion());
+      } catch (SQLException ex) {
+         OSEELog.logException(AtsPlugin.class, ex, true);
+      }
+   }
+
+   /* (non-Javadoc)
+    * @see org.eclipse.osee.ats.editor.toolbar.IAtsEditorToolBarService#getToolbarAction(org.eclipse.osee.ats.editor.SMAManager)
+    */
+   public Action getToolbarAction(SMAManager smaMgr) {
+      action = new Action(getName(), Action.AS_PUSH_BUTTON) {
+         public void run() {
+            performOpen();
+         }
+      };
+      action.setToolTipText(getName());
+      action.setImageDescriptor(AtsPlugin.getInstance().getImageDescriptor("version.gif"));
+      return action;
+   }
+
+   /* (non-Javadoc)
+    * @see org.eclipse.osee.ats.editor.toolbar.IAtsEditorToolBarService#refreshToolbarAction()
+    */
+   public void refreshToolbarAction() {
+      boolean enabled = false;
+      try {
+         enabled = ((TeamWorkFlowArtifact) smaMgr.getSma()).getTargetedForVersion() != null;
+      } catch (Exception ex) {
+         OSEELog.logException(AtsPlugin.class, ex, true);
+      }
+      action.setEnabled(enabled);
+   }
+
+   /* (non-Javadoc)
+    * @see org.eclipse.osee.ats.editor.toolbar.IAtsEditorToolBarService#showInToolbar(org.eclipse.osee.ats.editor.SMAManager)
+    */
+   public boolean showInToolbar(SMAManager smaMgr) {
+      return (smaMgr.getSma() instanceof TeamWorkFlowArtifact);
+   }
+}
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/PrivilegedEditService.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/PrivilegedEditService.java
index 204c42c1c97..fed877bc689 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/PrivilegedEditService.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/PrivilegedEditService.java
@@ -40,7 +40,7 @@ public class PrivilegedEditService extends WorkPageService {
 
    public PrivilegedEditService(SMAManager smaMgr, AtsWorkPage page, XFormToolkit toolkit, SMAWorkFlowSection section) {
       super("Privileged Edit", smaMgr, page, toolkit, section, ServicesArea.OPERATION_CATEGORY,
-            smaMgr.isCompleted() || smaMgr.isCancelled() ? Location.Global : Location.NonCompleteCurrentState);
+            smaMgr.isCompleted() || smaMgr.isCancelled() ? Location.Global : Location.CurrentState);
       this.smaMgr = smaMgr;
    }
 
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/ServicesArea.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/ServicesArea.java
index eb7ee66c084..1a9c46ac2d1 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/ServicesArea.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/ServicesArea.java
@@ -15,7 +15,6 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import org.eclipse.osee.ats.AtsPlugin;
 import org.eclipse.osee.ats.editor.IAtsStateItem;
 import org.eclipse.osee.ats.editor.SMAManager;
 import org.eclipse.osee.ats.editor.SMAWorkFlowSection;
@@ -42,7 +41,6 @@ public class ServicesArea {
    private final boolean isCurrentState;
    public static String STATISTIC_CATEGORY = "Statistics";
    public static String OPERATION_CATEGORY = "Operation";
-   public static String ADMIN_CATEGORY = "Admin";
    public static String DEBUG_PAGE_CATEGORY = "Debug";
 
    public ServicesArea(SMAManager smaMgr, AtsWorkPage page, XFormToolkit toolkit, SMAWorkFlowSection section) {
@@ -63,28 +61,20 @@ public class ServicesArea {
          // Operations
          services.add(new FavoriteOperation(smaMgr, page, toolkit, section));
          services.add(new SubscribedOperation(smaMgr, page, toolkit, section));
-         services.add(new OpenInAtsWorldOperation(smaMgr, page, toolkit, section));
-         services.add(new OpenInSkyWalkerOperation(smaMgr, page, toolkit, section));
-         services.add(new OpenInArtifactEditorOperation(smaMgr, page, toolkit, section));
-         services.add(new OpenParent(smaMgr, page, toolkit, section));
-         services.add(new OpenTeamDefinition(smaMgr, page, toolkit, section));
          services.add(new OpenLatestVersion(smaMgr, page, toolkit, section));
          services.add(new DebugOperations(smaMgr, page, toolkit, section));
-         services.add(new ShowNotesOperation(smaMgr, page, toolkit, section));
-         services.add(new AddNoteOperation(smaMgr, page, toolkit, section));
          services.add(new PrivilegedEditService(smaMgr, page, toolkit, section));
-         services.add(new EmailActionService(smaMgr, page, toolkit, section));
-         services.add(new AddDecisionReviewService(smaMgr, page, toolkit, section));
-         services.add(new AddPeerToPeerReviewService(smaMgr, page, toolkit, section));
          // Services
          services.add(new AtsAdminStat(smaMgr, page, toolkit, section));
-         services.add(new BlockingReview(smaMgr, page, toolkit, section));
          services.add(new HridStat(smaMgr, page, toolkit, section));
          services.add(new TotalPercentCompleteStat(smaMgr, page, toolkit, section));
          services.add(new TotalHoursSpentStat(smaMgr, page, toolkit, section));
          services.add(new TargetedForVersionState(smaMgr, page, toolkit, section));
          services.add(new StatePercentCompleteStat(smaMgr, page, toolkit, section));
          services.add(new StateHoursSpentStat(smaMgr, page, toolkit, section));
+         services.add(new AddDecisionReviewService(smaMgr, page, toolkit, section));
+         services.add(new AddPeerToPeerReviewService(smaMgr, page, toolkit, section));
+         services.add(new BlockingReview(smaMgr, page, toolkit, section));
          // Add extension services for this state
          for (IAtsStateItem item : smaMgr.getStateItems().getStateItems(page.getId())) {
             services.addAll(item.getServices(smaMgr, page, toolkit, section));
@@ -98,10 +88,6 @@ public class ServicesArea {
       for (WorkPageService service : services) {
          categories.add(service.getCategory());
       }
-      if (AtsPlugin.isAtsAdmin()) {
-         createServicesArea(comp, ADMIN_CATEGORY);
-      }
-      categories.remove(ADMIN_CATEGORY);
       createServicesArea(comp, STATISTIC_CATEGORY);
       categories.remove(STATISTIC_CATEGORY);
       createServicesArea(comp, OPERATION_CATEGORY);
@@ -121,6 +107,10 @@ public class ServicesArea {
             if (page.isDisplayService(service) && service.getCategory().equals(category) && service.getLocation() == Location.Global) displayServices.add(service);
       }
 
+      // Add all state
+      for (WorkPageService service : services)
+         if (page.isDisplayService(service) && service.getCategory().equals(category) && service.getLocation() == Location.AllState) displayServices.add(service);
+
       // Add all current state
       if (isCurrentState) {
          for (WorkPageService service : services) {
@@ -132,10 +122,6 @@ public class ServicesArea {
          }
       }
 
-      // Add all state
-      for (WorkPageService service : services)
-         if (page.isDisplayService(service) && service.getCategory().equals(category) && service.getLocation() == Location.AllState) displayServices.add(service);
-
       // Add all non-complete state
       for (WorkPageService service : services)
          if (page.isDisplayService(service) && service.getCategory().equals(category) && service.getLocation() == Location.AllNonCompleteState) if (!page.isCancelledPage() && !page.isCompletePage()) displayServices.add(service);
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/ShowNotesOperation.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/ShowNotesOperation.java
index 4e6aa8eba2e..8f71b6d972b 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/ShowNotesOperation.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/ShowNotesOperation.java
@@ -10,60 +10,41 @@
  *******************************************************************************/
 package org.eclipse.osee.ats.editor.service;
 
+import org.eclipse.jface.action.Action;
+import org.eclipse.osee.ats.AtsPlugin;
 import org.eclipse.osee.ats.editor.SMAManager;
 import org.eclipse.osee.ats.editor.SMAWorkFlowSection;
+import org.eclipse.osee.ats.editor.toolbar.IAtsEditorToolBarService;
 import org.eclipse.osee.ats.util.Overview;
 import org.eclipse.osee.ats.workflow.AtsWorkPage;
 import org.eclipse.osee.framework.jdk.core.util.AHTML;
 import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
 import org.eclipse.osee.framework.ui.skynet.XFormToolkit;
+import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
 import org.eclipse.osee.framework.ui.skynet.widgets.XDate;
 import org.eclipse.osee.framework.ui.skynet.widgets.xresults.XResultPage;
 import org.eclipse.osee.framework.ui.skynet.widgets.xresults.XResultView;
 import org.eclipse.osee.framework.ui.skynet.widgets.xresults.XResultPage.Manipulations;
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Group;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.Hyperlink;
 
 /**
  * @author Donald G. Dunne
  */
-public class ShowNotesOperation extends WorkPageService {
+public class ShowNotesOperation extends WorkPageService implements IAtsEditorToolBarService {
 
-   private final SMAManager smaMgr;
-   private Hyperlink link;
-
-   public ShowNotesOperation(SMAManager smaMgr, AtsWorkPage page, XFormToolkit toolkit, SMAWorkFlowSection section) {
+   public ShowNotesOperation(final SMAManager smaMgr, AtsWorkPage page, XFormToolkit toolkit, SMAWorkFlowSection section) {
       super("Show Notes", smaMgr, page, toolkit, section, ServicesArea.OPERATION_CATEGORY, Location.Global);
-      this.smaMgr = smaMgr;
+   }
+
+   /*
+    * This constructor is used for the toolbar service extension
+    */
+   public ShowNotesOperation(final SMAManager smaMgr) {
+      super("Show Note", smaMgr, null, null, null, null, null);
    }
 
    @Override
    public void create(Group workComp) {
-      link = toolkit.createHyperlink(workComp, name, SWT.NONE);
-      link.addHyperlinkListener(new IHyperlinkListener() {
-
-         public void linkEntered(HyperlinkEvent e) {
-         }
-
-         public void linkExited(HyperlinkEvent e) {
-         }
-
-         public void linkActivated(HyperlinkEvent e) {
-            String title =
-                  "Notes for " + smaMgr.getSma().getHumanReadableId() + " - \"" + smaMgr.getSma().getDescriptiveName() + "\"";
-            Overview logOver = new Overview();
-            logOver.addHtml(AHTML.heading(3, title));
-            logOver.addNotes(smaMgr.getSma(), "ALL");
-            XResultView.getResultView().addResultPage(
-                  new XResultPage(title + " - " + XDate.getDateNow(XDate.MMDDYYHHMM), logOver.getPage(),
-                        Manipulations.HTML_MANIPULATIONS));
-            AWorkbench.popup("Complete", "Notes in ATS Results");
-         }
-      });
-      refresh();
    }
 
    /*
@@ -83,4 +64,47 @@ public class ShowNotesOperation extends WorkPageService {
    @Override
    public void dispose() {
    }
+
+   private void performAddNote() {
+      try {
+         String title =
+               "Notes for " + smaMgr.getSma().getHumanReadableId() + " - \"" + smaMgr.getSma().getDescriptiveName() + "\"";
+         Overview logOver = new Overview();
+         logOver.addHtml(AHTML.heading(3, title));
+         logOver.addNotes(smaMgr.getSma(), "ALL");
+         XResultView.getResultView().addResultPage(
+               new XResultPage(title + " - " + XDate.getDateNow(XDate.MMDDYYHHMM), logOver.getPage(),
+                     Manipulations.HTML_MANIPULATIONS));
+         AWorkbench.popup("Complete", "Notes in ATS Results");
+      } catch (Exception ex) {
+         OSEELog.logException(AtsPlugin.class, ex, true);
+      }
+   }
+
+   /* (non-Javadoc)
+    * @see org.eclipse.osee.ats.editor.toolbar.IAtsEditorToolBarService#getToolbarAction(org.eclipse.osee.ats.editor.SMAManager)
+    */
+   public Action getToolbarAction(SMAManager smaMgr) {
+      Action action = new Action(getName(), Action.AS_PUSH_BUTTON) {
+         public void run() {
+            performAddNote();
+         }
+      };
+      action.setToolTipText(getName());
+      action.setImageDescriptor(AtsPlugin.getInstance().getImageDescriptor("note.gif"));
+      return action;
+   }
+
+   /* (non-Javadoc)
+    * @see org.eclipse.osee.ats.editor.toolbar.IAtsEditorToolBarService#refreshToolbarAction()
+    */
+   public void refreshToolbarAction() {
+   }
+
+   /* (non-Javadoc)
+    * @see org.eclipse.osee.ats.editor.toolbar.IAtsEditorToolBarService#showInToolbar(org.eclipse.osee.ats.editor.SMAManager)
+    */
+   public boolean showInToolbar(SMAManager smaMgr) {
+      return true;
+   }
 }
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/SubscribedOperation.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/SubscribedOperation.java
index c04402fc086..8c437548ed2 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/SubscribedOperation.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/SubscribedOperation.java
@@ -31,7 +31,7 @@ public class SubscribedOperation extends WorkPageService {
    private Hyperlink link;
 
    public SubscribedOperation(SMAManager smaMgr, AtsWorkPage page, XFormToolkit toolkit, SMAWorkFlowSection section) {
-      super("Subscribed", smaMgr, page, toolkit, section, ServicesArea.OPERATION_CATEGORY, Location.Global);
+      super("Subscribed", smaMgr, page, toolkit, section, ServicesArea.OPERATION_CATEGORY, Location.CurrentState);
       this.smaMgr = smaMgr;
    }
 
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/TargetedForVersionState.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/TargetedForVersionState.java
index 81eb8aab1d6..d16eb915e1f 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/TargetedForVersionState.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/TargetedForVersionState.java
@@ -13,12 +13,10 @@ package org.eclipse.osee.ats.editor.service;
 
 import java.sql.SQLException;
 import org.eclipse.osee.ats.AtsPlugin;
-import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.editor.SMAManager;
 import org.eclipse.osee.ats.editor.SMAWorkFlowSection;
 import org.eclipse.osee.ats.workflow.AtsWorkPage;
 import org.eclipse.osee.framework.ui.skynet.XFormToolkit;
-import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor;
 import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Group;
@@ -34,10 +32,9 @@ public class TargetedForVersionState extends WorkPageService {
 
    private Hyperlink link;
    private Label label;
-   private Hyperlink openLink;
 
    public TargetedForVersionState(SMAManager smaMgr, AtsWorkPage page, XFormToolkit toolkit, SMAWorkFlowSection section) {
-      super("Target Version", smaMgr, page, toolkit, section, ServicesArea.STATISTIC_CATEGORY, Location.Global);
+      super("Target Version", smaMgr, page, toolkit, section, ServicesArea.STATISTIC_CATEGORY, Location.CurrentState);
    }
 
    @Override
@@ -71,29 +68,6 @@ public class TargetedForVersionState extends WorkPageService {
                   }
                }
             });
-         try {
-            if ((smaMgr.getSma() instanceof TeamWorkFlowArtifact) && (((TeamWorkFlowArtifact) smaMgr.getSma()).getTargetedForVersion() != null)) {
-               openLink = toolkit.createHyperlink(workComp, "Open Version Artifact", SWT.NONE);
-               openLink.addHyperlinkListener(new IHyperlinkListener() {
-
-                  public void linkEntered(HyperlinkEvent e) {
-                  }
-
-                  public void linkExited(HyperlinkEvent e) {
-                  }
-
-                  public void linkActivated(HyperlinkEvent e) {
-                     try {
-                        if (((TeamWorkFlowArtifact) smaMgr.getSma()).getTargetedForVersion() != null) ArtifactEditor.editArtifact(((TeamWorkFlowArtifact) smaMgr.getSma()).getTargetedForVersion());
-                     } catch (SQLException ex) {
-                        OSEELog.logException(AtsPlugin.class, ex, true);
-                     }
-                  }
-               });
-            }
-         } catch (SQLException ex) {
-            OSEELog.logException(AtsPlugin.class, ex, false);
-         }
       } else
          label = toolkit.createLabel(workComp, "", SWT.NONE);
       refresh();
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/TotalHoursSpentStat.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/TotalHoursSpentStat.java
index 83abbcc054d..83ad9a13107 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/TotalHoursSpentStat.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/TotalHoursSpentStat.java
@@ -27,7 +27,7 @@ public class TotalHoursSpentStat extends WorkPageService {
    private Label label;
 
    public TotalHoursSpentStat(SMAManager smaMgr, AtsWorkPage page, XFormToolkit toolkit, SMAWorkFlowSection section) {
-      super("Hours Spent", smaMgr, page, toolkit, section, ServicesArea.STATISTIC_CATEGORY, Location.Global);
+      super("Hours Spent", smaMgr, page, toolkit, section, ServicesArea.STATISTIC_CATEGORY, Location.CurrentState);
    }
 
    /*
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/TotalPercentCompleteStat.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/TotalPercentCompleteStat.java
index 8947c214ab5..541368a934c 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/TotalPercentCompleteStat.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/TotalPercentCompleteStat.java
@@ -26,7 +26,7 @@ public class TotalPercentCompleteStat extends WorkPageService {
    private Label label;
 
    public TotalPercentCompleteStat(SMAManager smaMgr, AtsWorkPage page, XFormToolkit toolkit, SMAWorkFlowSection section) {
-      super("Percent Complete", smaMgr, page, toolkit, section, ServicesArea.STATISTIC_CATEGORY, Location.Global);
+      super("Percent Complete", smaMgr, page, toolkit, section, ServicesArea.STATISTIC_CATEGORY, Location.CurrentState);
    }
 
    /*
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/WorkPageService.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/WorkPageService.java
index 89c2539dd36..8473db854b5 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/WorkPageService.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/WorkPageService.java
@@ -37,7 +37,7 @@ public abstract class WorkPageService {
    // Complete)
    // SpecifiedPageId - Created if isSpecifiedPageId() returns true
    public static enum Location {
-      Global, AllState, AllNonCompleteState, CurrentState, NonCompleteCurrentState, SpecifiedPageId
+      None, Global, AllState, AllNonCompleteState, CurrentState, NonCompleteCurrentState, SpecifiedPageId
    };
    protected final String serviceType;
    protected final Location location;
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/toolbar/ToolbarArea.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/toolbar/ToolbarArea.java
index f67bd19c5e2..6e8ad3796bf 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/toolbar/ToolbarArea.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/toolbar/ToolbarArea.java
@@ -44,7 +44,7 @@ public class ToolbarArea {
    public void create(IToolBarManager toolbarManager) {
       for (final IAtsEditorToolBarService atsEditorToolBarService : services) {
          try {
-            if (atsEditorToolBarService.showInToolbar(null)) {
+            if (atsEditorToolBarService.showInToolbar(smaMgr)) {
                toolbarManager.add(atsEditorToolBarService.getToolbarAction(smaMgr));
             }
          } catch (Exception ex) {
diff --git a/org.eclipse.osee.ats/support/ATS_Skynet_Types.xml b/org.eclipse.osee.ats/support/ATS_Skynet_Types.xml
index 142d7ded04a..d5ce4ba12c2 100644
--- a/org.eclipse.osee.ats/support/ATS_Skynet_Types.xml
+++ b/org.eclipse.osee.ats/support/ATS_Skynet_Types.xml
@@ -1072,7 +1072,7 @@
     <Cell><Data ss:Type="String">Team Workflow</Data></Cell>

     <Cell><Data ss:Type="String">is reviewed by </Data></Cell>

     <Cell><Data ss:Type="String">Artifact</Data></Cell>

-    <Cell><Data ss:Type="String">if review of</Data></Cell>

+    <Cell><Data ss:Type="String">is review of</Data></Cell>

     <Cell><Data ss:Type="String">TWtDR</Data></Cell>

    </Row>

    <Row>

@@ -1429,12 +1429,12 @@
   </Table>

   <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">

    <Selected/>

-   <TopRowVisible>26</TopRowVisible>

+   <TopRowVisible>146</TopRowVisible>

    <Panes>

     <Pane>

      <Number>3</Number>

-     <ActiveRow>37</ActiveRow>

-     <RangeSelection>R38:R39</RangeSelection>

+     <ActiveRow>182</ActiveRow>

+     <ActiveCol>4</ActiveCol>

     </Pane>

    </Panes>

    <ProtectObjects>False</ProtectObjects>