Merge branch 'master' of https://github.com/nasa/openmct into three-dot-menu-proto

fix lint errors
git enable legacy toolbar for legacy tables
2020-10-19 10:29:38 -07:00 · 2020-10-18 15:55:39 -07:00 · 2020-10-15 11:55:21 -07:00 · 2020-10-15 09:49:32 -07:00 · 2020-10-07 14:01:36 -07:00 · 2020-10-07 12:30:07 -07:00
154 changed files with 3174 additions and 5494 deletions
--- a/example/generator/GeneratorProvider.js
+++ b/example/generator/GeneratorProvider.js
@@ -76,7 +76,6 @@ define([

            workerRequest[prop] = Number(workerRequest[prop]);
        });
-
        workerRequest.name = domainObject.name;

        return workerRequest;
--- a/example/generator/generatorWorker.js
+++ b/example/generator/generatorWorker.js
@@ -108,6 +108,7 @@

        for (; nextStep < end && data.length < 5000; nextStep += step) {
            data.push({
+                name: request.name,
                utc: nextStep,
                yesterday: nextStep - 60 * 60 * 24 * 1000,
                sin: sin(nextStep, period, amplitude, offset, phase, randomness),
--- a/index.html
+++ b/index.html
@@ -30,50 +30,12 @@
        <link rel="icon" type="image/png" href="dist/favicons/favicon-96x96.png" sizes="96x96" type="image/x-icon">
        <link rel="icon" type="image/png" href="dist/favicons/favicon-32x32.png" sizes="32x32" type="image/x-icon">
        <link rel="icon" type="image/png" href="dist/favicons/favicon-16x16.png" sizes="16x16" type="image/x-icon">
-        <style type="text/css">
-            @keyframes splash-spinner {
-                0% {
-                    transform: translate(-50%, -50%) rotate(0deg); }
-                100% {
-                    transform: translate(-50%, -50%) rotate(360deg); } }
-
-            #splash-screen {
-                background-color: black;
-                position: absolute;
-                top: 0; right: 0; bottom: 0; left: 0;
-                z-index: 10000;
-            }
-
-            #splash-screen:before {
-                animation-name: splash-spinner;
-                animation-duration: 0.5s;
-                animation-iteration-count: infinite;
-                animation-timing-function: linear;
-                border-radius: 50%;
-                border-color: rgba(255,255,255,0.25);
-                border-top-color: white;
-                border-style: solid;
-                border-width: 10px;
-                content: '';
-                display: block;
-                opacity: 0.25;
-                position: absolute;
-                left: 50%; top: 50%;
-                height: 100px; width: 100px;
-            }
-        </style>
    </head>
    <body>
    </body>
    <script>
        const THIRTY_SECONDS = 30 * 1000;
-        const ONE_MINUTE = THIRTY_SECONDS * 2;
-        const FIVE_MINUTES = ONE_MINUTE * 5;
-        const FIFTEEN_MINUTES = FIVE_MINUTES * 3;
-        const THIRTY_MINUTES = FIFTEEN_MINUTES * 2;
-        const ONE_HOUR = THIRTY_MINUTES * 2;
-        const TWO_HOURS = ONE_HOUR * 2;
-        const ONE_DAY = ONE_HOUR * 24;
+        const THIRTY_MINUTES = THIRTY_SECONDS * 60;

        [
            'example/eventGenerator'
@@ -111,21 +73,21 @@
                        {
                            label: 'Last Day',
                            bounds: {
-                                start: () => Date.now() - ONE_DAY,
+                                start: () => Date.now() - 1000 * 60 * 60 * 24,
                                end: () => Date.now()
                            }
                        },
                        {
                            label: 'Last 2 hours',
                            bounds: {
-                                start: () => Date.now() - TWO_HOURS,
+                                start: () => Date.now() - 1000 * 60 * 60 * 2,
                                end: () => Date.now()
                            }
                        },
                        {
                            label: 'Last hour',
                            bounds: {
-                                start: () => Date.now() - ONE_HOUR,
+                                start: () => Date.now() - 1000 * 60 * 60,
                                end: () => Date.now()
                            }
                        }
@@ -134,7 +96,7 @@
                    records: 10,
                    // maximum duration between start and end bounds
                    // for utc-based time systems this is in milliseconds
-                    limit: ONE_DAY
+                    limit: 1000 * 60 * 60 * 24
                },
                {
                    name: "Realtime",
@@ -143,44 +105,7 @@
                    clockOffsets: {
                        start: - THIRTY_MINUTES,
                        end: THIRTY_SECONDS
-                    },
-                    presets: [
-                        {
-                            label: '1 Hour',
-                            bounds: {
-                                start: - ONE_HOUR,
-                                end: THIRTY_SECONDS
-                            }
-                        },
-                        {
-                            label: '30 Minutes',
-                            bounds: {
-                                start: - THIRTY_MINUTES,
-                                end: THIRTY_SECONDS
-                            }
-                        },
-                        {
-                            label: '15 Minutes',
-                            bounds: {
-                                start: - FIFTEEN_MINUTES,
-                                end: THIRTY_SECONDS
-                            }
-                        },
-                        {
-                            label: '5 Minutes',
-                            bounds: {
-                                start: - FIVE_MINUTES,
-                                end: THIRTY_SECONDS
-                            }
-                        },
-                        {
-                            label: '1 Minute',
-                            bounds: {
-                                start: - ONE_MINUTE,
-                                end: THIRTY_SECONDS
-                            }
-                        }
-                    ]
+                    }
                }
            ]
        }));
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "openmct",
-  "version": "1.4.1-SNAPSHOT",
+  "version": "1.3.3-SNAPSHOT",
  "description": "The Open MCT core platform",
  "dependencies": {},
  "devDependencies": {
--- a/platform/commonUI/general/res/templates/label.html
+++ b/platform/commonUI/general/res/templates/label.html
@@ -20,12 +20,12 @@
 at runtime from the About dialog for additional information.
 -->
 <div class="c-object-label"
-     ng-class="{ 'is-status--missing': model.status === 'missing' }"
+     ng-class="{ 'is-missing': model.status === 'missing' }"
 >
    <div class="c-object-label__type-icon {{type.getCssClass()}}"
         ng-class="{ 'l-icon-link':location.isLink() }"
    >
-        <span class="is-status__indicator" title="This item is missing or suspect"></span>
+        <span class="is-missing__indicator" title="This item is missing"></span>
    </div>
    <div class='c-object-label__name'>{{model.name}}</div>
 </div>
--- a/platform/entanglement/bundle.js
+++ b/platform/entanglement/bundle.js
@@ -21,24 +21,32 @@
 *****************************************************************************/

 define([
+    "./src/actions/MoveAction",
+    "./src/actions/CopyAction",
    "./src/actions/LinkAction",
    "./src/actions/SetPrimaryLocationAction",
    "./src/services/LocatingCreationDecorator",
    "./src/services/LocatingObjectDecorator",
    "./src/policies/CopyPolicy",
    "./src/policies/CrossSpacePolicy",
+    "./src/policies/MovePolicy",
    "./src/capabilities/LocationCapability",
+    "./src/services/MoveService",
    "./src/services/LinkService",
    "./src/services/CopyService",
    "./src/services/LocationService"
 ], function (
+    MoveAction,
+    CopyAction,
    LinkAction,
    SetPrimaryLocationAction,
    LocatingCreationDecorator,
    LocatingObjectDecorator,
    CopyPolicy,
    CrossSpacePolicy,
+    MovePolicy,
    LocationCapability,
+    MoveService,
    LinkService,
    CopyService,
    LocationService
@@ -52,6 +60,39 @@ define([
            "configuration": {},
            "extensions": {
                "actions": [
+                    {
+                        "key": "move",
+                        "name": "Move",
+                        "description": "Move object to another location.",
+                        "cssClass": "icon-move",
+                        "category": "contextual",
+                        "group": "action",
+                        "priority": 9,
+                        "implementation": MoveAction,
+                        "depends": [
+                            "policyService",
+                            "locationService",
+                            "moveService"
+                        ]
+                    },
+                    {
+                        "key": "copy",
+                        "name": "Duplicate",
+                        "description": "Duplicate object to another location.",
+                        "cssClass": "icon-duplicate",
+                        "category": "contextual",
+                        "group": "action",
+                        "priority": 8,
+                        "implementation": CopyAction,
+                        "depends": [
+                            "$log",
+                            "policyService",
+                            "locationService",
+                            "copyService",
+                            "dialogService",
+                            "notificationService"
+                        ]
+                    },
                    {
                        "key": "link",
                        "name": "Create Link",
@@ -100,6 +141,10 @@ define([
                    {
                        "category": "action",
                        "implementation": CopyPolicy
+                    },
+                    {
+                        "category": "action",
+                        "implementation": MovePolicy
                    }
                ],
                "capabilities": [
@@ -115,6 +160,17 @@ define([
                    }
                ],
                "services": [
+                    {
+                        "key": "moveService",
+                        "name": "Move Service",
+                        "description": "Provides a service for moving objects",
+                        "implementation": MoveService,
+                        "depends": [
+                            "openmct",
+                            "linkService",
+                            "$q"
+                        ]
+                    },
                    {
                        "key": "linkService",
                        "name": "Link Service",
--- a/platform/entanglement/src/actions/CopyAction.js
+++ b/platform/entanglement/src/actions/CopyAction.js
@@ -0,0 +1,168 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2020, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is 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.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(
+    ['./AbstractComposeAction', './CancelError'],
+    function (AbstractComposeAction, CancelError) {
+
+        /**
+         * The CopyAction is available from context menus and allows a user to
+         * deep copy an object to another location of their choosing.
+         *
+         * @implements {Action}
+         * @constructor
+         * @memberof platform/entanglement
+         */
+        function CopyAction(
+            $log,
+            policyService,
+            locationService,
+            copyService,
+            dialogService,
+            notificationService,
+            context
+        ) {
+            this.dialog = undefined;
+            this.notification = undefined;
+            this.dialogService = dialogService;
+            this.notificationService = notificationService;
+            this.$log = $log;
+            //Extend the behaviour of the Abstract Compose Action
+            AbstractComposeAction.call(
+                this,
+                policyService,
+                locationService,
+                copyService,
+                context,
+                "Duplicate",
+                "To a Location"
+            );
+        }
+
+        CopyAction.prototype = Object.create(AbstractComposeAction.prototype);
+
+        /**
+         * Updates user about progress of copy. Should not be invoked by
+         * client code under any circumstances.
+         *
+         * @private
+         * @param phase
+         * @param totalObjects
+         * @param processed
+         */
+        CopyAction.prototype.progress = function (phase, totalObjects, processed) {
+            /*
+             Copy has two distinct phases. In the first phase a copy plan is
+             made in memory. During this phase of execution, the user is
+             shown a blocking 'modal' dialog.
+
+             In the second phase, the copying is taking place, and the user
+             is shown non-invasive banner notifications at the bottom of the screen.
+             */
+            if (phase.toLowerCase() === 'preparing' && !this.dialog) {
+                this.dialog = this.dialogService.showBlockingMessage({
+                    title: "Preparing to copy objects",
+                    hint: "Do not navigate away from this page or close this browser tab while this message is displayed.",
+                    unknownProgress: true,
+                    severity: "info"
+                });
+            } else if (phase.toLowerCase() === "copying") {
+                if (this.dialog) {
+                    this.dialog.dismiss();
+                }
+
+                if (!this.notification) {
+                    this.notification = this.notificationService
+                        .notify({
+                            title: "Copying objects",
+                            unknownProgress: false,
+                            severity: "info"
+                        });
+                }
+
+                this.notification.model.progress = (processed / totalObjects) * 100;
+                this.notification.model.title = ["Copied ", processed, "of ",
+                    totalObjects, "objects"].join(" ");
+            }
+        };
+
+        /**
+         * Executes the CopyAction. The CopyAction uses the default behaviour of
+         * the AbstractComposeAction, but extends it to support notification
+         * updates of progress on copy.
+         */
+        CopyAction.prototype.perform = function () {
+            var self = this;
+
+            function success(domainObject) {
+                var domainObjectName = domainObject.model.name;
+
+                self.notification.dismiss();
+                self.notificationService.info(domainObjectName + " copied successfully.");
+            }
+
+            function error(errorDetails) {
+                // No need to notify user of their own cancellation
+                if (errorDetails instanceof CancelError) {
+                    return;
+                }
+
+                var errorDialog,
+                    errorMessage = {
+                        title: "Error copying objects.",
+                        severity: "error",
+                        hint: errorDetails.message,
+                        minimized: true, // want the notification to be minimized initially (don't show banner)
+                        options: [{
+                            label: "OK",
+                            callback: function () {
+                                errorDialog.dismiss();
+                            }
+                        }]
+                    };
+
+                self.dialog.dismiss();
+                if (self.notification) {
+                    self.notification.dismiss(); // Clear the progress notification
+                }
+
+                self.$log.error("Error copying objects. ", errorDetails);
+                //Show a minimized notification of error for posterity
+                self.notificationService.notify(errorMessage);
+                //Display a blocking message
+                errorDialog = self.dialogService.showBlockingMessage(errorMessage);
+
+            }
+
+            function notification(details) {
+                self.progress(details.phase, details.totalObjects, details.processed);
+            }
+
+            return AbstractComposeAction.prototype.perform.call(this)
+                .then(success, error, notification);
+        };
+
+        CopyAction.appliesTo = AbstractComposeAction.appliesTo;
+
+        return CopyAction;
+    }
+);
--- a/src/plugins/interceptors/missingObjectInterceptor.js
+++ b/src/plugins/interceptors/missingObjectInterceptor.js
@@ -20,21 +20,40 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/

-export default function MissingObjectInterceptor(openmct) {
-    openmct.objects.addGetInterceptor({
-        appliesTo: (identifier, domainObject) => {
-            return identifier.key !== 'mine';
-        },
-        invoke: (identifier, object) => {
-            if (object === undefined) {
-                return {
-                    identifier,
-                    type: 'unknown',
-                    name: 'Missing: ' + openmct.objects.makeKeyString(identifier)
-                };
+define(
+    ['./AbstractComposeAction'],
+    function (AbstractComposeAction) {
+
+        /**
+         * The MoveAction is available from context menus and allows a user to
+         * move an object to another location of their choosing.
+         *
+         * @implements {Action}
+         * @constructor
+         * @memberof platform/entanglement
+         */
+        function MoveAction(policyService, locationService, moveService, context) {
+            AbstractComposeAction.apply(
+                this,
+                [policyService, locationService, moveService, context, "Move"]
+            );
+        }
+
+        MoveAction.prototype = Object.create(AbstractComposeAction.prototype);
+
+        MoveAction.appliesTo = function (context) {
+            var applicableObject =
+                context.selectedObject || context.domainObject;
+
+            if (applicableObject && applicableObject.model.locked) {
+                return false;
            }

-            return object;
-        }
-    });
-}
+            return Boolean(applicableObject
+                && applicableObject.hasCapability('context'));
+        };
+
+        return MoveAction;
+    }
+);
+
--- a/platform/entanglement/src/policies/MovePolicy.js
+++ b/platform/entanglement/src/policies/MovePolicy.js
@@ -20,24 +20,44 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/

-export default function MyItemsInterceptor(openmct) {
+define([], function () {

-    openmct.objects.addGetInterceptor({
-        appliesTo: (identifier, domainObject) => {
-            return identifier.key === 'mine';
-        },
-        invoke: (identifier, object) => {
-            if (object === undefined) {
-                return {
-                    identifier,
-                    "name": "My Items",
-                    "type": "folder",
-                    "composition": [],
-                    "location": "ROOT"
-                };
-            }
+    /**
+     * Disallow moves when either the parent or the child are not
+     * modifiable by users.
+     * @constructor
+     * @implements {Policy}
+     * @memberof platform/entanglement
+     */
+    function MovePolicy() {
+    }

-            return object;
+    function parentOf(domainObject) {
+        var context = domainObject.getCapability('context');
+
+        return context && context.getParent();
+    }
+
+    function allowMutation(domainObject) {
+        var type = domainObject && domainObject.getCapability('type');
+
+        return Boolean(type && type.hasFeature('creation'));
+    }
+
+    function selectedObject(context) {
+        return context.selectedObject || context.domainObject;
+    }
+
+    MovePolicy.prototype.allow = function (action, context) {
+        var key = action.getMetadata().key;
+
+        if (key === 'move') {
+            return allowMutation(selectedObject(context))
+                && allowMutation(parentOf(selectedObject(context)));
        }
-    });
-}
+
+        return true;
+    };
+
+    return MovePolicy;
+});
--- a/platform/entanglement/src/services/MoveService.js
+++ b/platform/entanglement/src/services/MoveService.js
@@ -0,0 +1,104 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2020, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is 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.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(
+    function () {
+        /**
+         * MoveService provides an interface for moving objects from one
+         * location to another.  It also provides a method for determining if
+         * an object can be copied to a specific location.
+         * @constructor
+         * @memberof platform/entanglement
+         * @implements {platform/entanglement.AbstractComposeService}
+         */
+        function MoveService(openmct, linkService) {
+            this.openmct = openmct;
+            this.linkService = linkService;
+        }
+
+        MoveService.prototype.validate = function (object, parentCandidate) {
+            var currentParent = object
+                .getCapability('context')
+                .getParent();
+
+            if (!parentCandidate || !parentCandidate.getId) {
+                return false;
+            }
+
+            if (parentCandidate.getId() === currentParent.getId()) {
+                return false;
+            }
+
+            if (parentCandidate.getId() === object.getId()) {
+                return false;
+            }
+
+            if (parentCandidate.getModel().composition.indexOf(object.getId()) !== -1) {
+                return false;
+            }
+
+            return this.openmct.composition.checkPolicy(
+                parentCandidate.useCapability('adapter'),
+                object.useCapability('adapter')
+            );
+        };
+
+        MoveService.prototype.perform = function (object, parentObject) {
+            function relocate(objectInNewContext) {
+                var newLocationCapability = objectInNewContext
+                        .getCapability('location'),
+                    oldLocationCapability = object
+                        .getCapability('location');
+
+                if (!newLocationCapability
+                        || !oldLocationCapability) {
+                    return;
+                }
+
+                if (oldLocationCapability.isOriginal()) {
+                    return newLocationCapability.setPrimaryLocation(
+                        newLocationCapability
+                            .getContextualLocation()
+                    );
+                }
+            }
+
+            if (!this.validate(object, parentObject)) {
+                throw new Error(
+                    "Tried to move objects without validating first."
+                );
+            }
+
+            return this.linkService
+                .perform(object, parentObject)
+                .then(relocate)
+                .then(function () {
+                    return object
+                        .getCapability('action')
+                        .perform('remove', true);
+                });
+        };
+
+        return MoveService;
+    }
+);
+
--- a/platform/entanglement/test/actions/CopyActionSpec.js
+++ b/platform/entanglement/test/actions/CopyActionSpec.js
@@ -0,0 +1,243 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2020, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is 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.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(
+    [
+        '../../src/actions/CopyAction',
+        '../services/MockCopyService',
+        '../DomainObjectFactory'
+    ],
+    function (CopyAction, MockCopyService, domainObjectFactory) {
+
+        describe("Copy Action", function () {
+
+            var copyAction,
+                policyService,
+                locationService,
+                locationServicePromise,
+                copyService,
+                context,
+                selectedObject,
+                selectedObjectContextCapability,
+                currentParent,
+                newParent,
+                notificationService,
+                notification,
+                dialogService,
+                mockDialog,
+                mockLog,
+                abstractComposePromise,
+                domainObject = {model: {name: "mockObject"}},
+                progress = {
+                    phase: "copying",
+                    totalObjects: 10,
+                    processed: 1
+                };
+
+            beforeEach(function () {
+                policyService = jasmine.createSpyObj(
+                    'policyService',
+                    ['allow']
+                );
+                policyService.allow.and.returnValue(true);
+
+                selectedObjectContextCapability = jasmine.createSpyObj(
+                    'selectedObjectContextCapability',
+                    [
+                        'getParent'
+                    ]
+                );
+
+                selectedObject = domainObjectFactory({
+                    name: 'selectedObject',
+                    model: {
+                        name: 'selectedObject'
+                    },
+                    capabilities: {
+                        context: selectedObjectContextCapability
+                    }
+                });
+
+                currentParent = domainObjectFactory({
+                    name: 'currentParent'
+                });
+
+                selectedObjectContextCapability
+                    .getParent
+                    .and.returnValue(currentParent);
+
+                newParent = domainObjectFactory({
+                    name: 'newParent'
+                });
+
+                locationService = jasmine.createSpyObj(
+                    'locationService',
+                    [
+                        'getLocationFromUser'
+                    ]
+                );
+
+                locationServicePromise = jasmine.createSpyObj(
+                    'locationServicePromise',
+                    [
+                        'then'
+                    ]
+                );
+
+                abstractComposePromise = jasmine.createSpyObj(
+                    'abstractComposePromise',
+                    [
+                        'then'
+                    ]
+                );
+
+                abstractComposePromise.then.and.callFake(function (success, error, notify) {
+                    notify(progress);
+                    success(domainObject);
+                });
+
+                locationServicePromise.then.and.callFake(function (callback) {
+                    callback(newParent);
+
+                    return abstractComposePromise;
+                });
+
+                locationService
+                    .getLocationFromUser
+                    .and.returnValue(locationServicePromise);
+
+                dialogService = jasmine.createSpyObj('dialogService',
+                    ['showBlockingMessage']
+                );
+
+                mockDialog = jasmine.createSpyObj("dialog", ["dismiss"]);
+                dialogService.showBlockingMessage.and.returnValue(mockDialog);
+
+                notification = jasmine.createSpyObj('notification',
+                    ['dismiss', 'model']
+                );
+
+                notificationService = jasmine.createSpyObj('notificationService',
+                    ['notify', 'info']
+                );
+
+                notificationService.notify.and.returnValue(notification);
+
+                mockLog = jasmine.createSpyObj('log', ['error']);
+
+                copyService = new MockCopyService();
+            });
+
+            describe("with context from context-action", function () {
+                beforeEach(function () {
+                    context = {
+                        domainObject: selectedObject
+                    };
+
+                    copyAction = new CopyAction(
+                        mockLog,
+                        policyService,
+                        locationService,
+                        copyService,
+                        dialogService,
+                        notificationService,
+                        context
+                    );
+                });
+
+                it("initializes happily", function () {
+                    expect(copyAction).toBeDefined();
+                });
+
+                describe("when performed it", function () {
+                    beforeEach(function () {
+                        spyOn(copyAction, 'progress').and.callThrough();
+                        copyAction.perform();
+                    });
+
+                    it("prompts for location", function () {
+                        expect(locationService.getLocationFromUser)
+                            .toHaveBeenCalledWith(
+                                "Duplicate selectedObject To a Location",
+                                "Duplicate To",
+                                jasmine.any(Function),
+                                currentParent
+                            );
+                    });
+
+                    it("waits for location and handles cancellation by user", function () {
+                        expect(locationServicePromise.then)
+                            .toHaveBeenCalledWith(jasmine.any(Function), jasmine.any(Function));
+                    });
+
+                    it("copies object to selected location", function () {
+                        locationServicePromise
+                            .then
+                            .calls.mostRecent()
+                            .args[0](newParent);
+
+                        expect(copyService.perform)
+                            .toHaveBeenCalledWith(selectedObject, newParent);
+                    });
+
+                    it("notifies the user of progress", function () {
+                        expect(notificationService.info).toHaveBeenCalled();
+                    });
+
+                    it("notifies the user with name of object copied", function () {
+                        expect(notificationService.info)
+                            .toHaveBeenCalledWith("mockObject copied successfully.");
+                    });
+                });
+            });
+
+            describe("with context from drag-drop", function () {
+                beforeEach(function () {
+                    context = {
+                        selectedObject: selectedObject,
+                        domainObject: newParent
+                    };
+
+                    copyAction = new CopyAction(
+                        mockLog,
+                        policyService,
+                        locationService,
+                        copyService,
+                        dialogService,
+                        notificationService,
+                        context
+                    );
+                });
+
+                it("initializes happily", function () {
+                    expect(copyAction).toBeDefined();
+                });
+
+                it("performs copy immediately", function () {
+                    copyAction.perform();
+                    expect(copyService.perform)
+                        .toHaveBeenCalledWith(selectedObject, newParent);
+                });
+            });
+        });
+    }
+);
--- a/platform/entanglement/test/actions/MoveActionSpec.js
+++ b/platform/entanglement/test/actions/MoveActionSpec.js
@@ -0,0 +1,178 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2020, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is 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.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(
+    [
+        '../../src/actions/MoveAction',
+        '../services/MockMoveService',
+        '../DomainObjectFactory'
+    ],
+    function (MoveAction, MockMoveService, domainObjectFactory) {
+
+        describe("Move Action", function () {
+
+            var moveAction,
+                policyService,
+                locationService,
+                locationServicePromise,
+                moveService,
+                context,
+                selectedObject,
+                selectedObjectContextCapability,
+                currentParent,
+                newParent;
+
+            beforeEach(function () {
+                policyService = jasmine.createSpyObj(
+                    'policyService',
+                    ['allow']
+                );
+                policyService.allow.and.returnValue(true);
+
+                selectedObjectContextCapability = jasmine.createSpyObj(
+                    'selectedObjectContextCapability',
+                    [
+                        'getParent'
+                    ]
+                );
+
+                selectedObject = domainObjectFactory({
+                    name: 'selectedObject',
+                    model: {
+                        name: 'selectedObject'
+                    },
+                    capabilities: {
+                        context: selectedObjectContextCapability
+                    }
+                });
+
+                currentParent = domainObjectFactory({
+                    name: 'currentParent'
+                });
+
+                selectedObjectContextCapability
+                    .getParent
+                    .and.returnValue(currentParent);
+
+                newParent = domainObjectFactory({
+                    name: 'newParent'
+                });
+
+                locationService = jasmine.createSpyObj(
+                    'locationService',
+                    [
+                        'getLocationFromUser'
+                    ]
+                );
+
+                locationServicePromise = jasmine.createSpyObj(
+                    'locationServicePromise',
+                    [
+                        'then'
+                    ]
+                );
+
+                locationService
+                    .getLocationFromUser
+                    .and.returnValue(locationServicePromise);
+
+                moveService = new MockMoveService();
+            });
+
+            describe("with context from context-action", function () {
+                beforeEach(function () {
+                    context = {
+                        domainObject: selectedObject
+                    };
+
+                    moveAction = new MoveAction(
+                        policyService,
+                        locationService,
+                        moveService,
+                        context
+                    );
+                });
+
+                it("initializes happily", function () {
+                    expect(moveAction).toBeDefined();
+                });
+
+                describe("when performed it", function () {
+                    beforeEach(function () {
+                        moveAction.perform();
+                    });
+
+                    it("prompts for location", function () {
+                        expect(locationService.getLocationFromUser)
+                            .toHaveBeenCalledWith(
+                                "Move selectedObject To a New Location",
+                                "Move To",
+                                jasmine.any(Function),
+                                currentParent
+                            );
+                    });
+
+                    it("waits for location and handles cancellation by user", function () {
+                        expect(locationServicePromise.then)
+                            .toHaveBeenCalledWith(jasmine.any(Function), jasmine.any(Function));
+                    });
+
+                    it("moves object to selected location", function () {
+                        locationServicePromise
+                            .then
+                            .calls.mostRecent()
+                            .args[0](newParent);
+
+                        expect(moveService.perform)
+                            .toHaveBeenCalledWith(selectedObject, newParent);
+                    });
+                });
+            });
+
+            describe("with context from drag-drop", function () {
+                beforeEach(function () {
+                    context = {
+                        selectedObject: selectedObject,
+                        domainObject: newParent
+                    };
+
+                    moveAction = new MoveAction(
+                        policyService,
+                        locationService,
+                        moveService,
+                        context
+                    );
+                });
+
+                it("initializes happily", function () {
+                    expect(moveAction).toBeDefined();
+                });
+
+                it("performs move immediately", function () {
+                    moveAction.perform();
+                    expect(moveService.perform)
+                        .toHaveBeenCalledWith(selectedObject, newParent);
+                });
+            });
+        });
+    }
+);
--- a/platform/entanglement/test/policies/MovePolicySpec.js
+++ b/platform/entanglement/test/policies/MovePolicySpec.js
@@ -0,0 +1,124 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2020, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is 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.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define([
+    '../../src/policies/MovePolicy',
+    '../DomainObjectFactory'
+], function (MovePolicy, domainObjectFactory) {
+
+    describe("MovePolicy", function () {
+        var testMetadata,
+            testContext,
+            mockDomainObject,
+            mockParent,
+            mockParentType,
+            mockType,
+            mockAction,
+            policy;
+
+        beforeEach(function () {
+            var mockContextCapability =
+                    jasmine.createSpyObj('context', ['getParent']);
+
+            mockType =
+                jasmine.createSpyObj('type', ['hasFeature']);
+            mockParentType =
+                jasmine.createSpyObj('parent-type', ['hasFeature']);
+
+            testMetadata = {};
+
+            mockDomainObject = domainObjectFactory({
+                capabilities: {
+                    context: mockContextCapability,
+                    type: mockType
+                }
+            });
+            mockParent = domainObjectFactory({
+                capabilities: {
+                    type: mockParentType
+                }
+            });
+
+            mockContextCapability.getParent.and.returnValue(mockParent);
+
+            mockType.hasFeature.and.callFake(function (feature) {
+                return feature === 'creation';
+            });
+            mockParentType.hasFeature.and.callFake(function (feature) {
+                return feature === 'creation';
+            });
+
+            mockAction = jasmine.createSpyObj('action', ['getMetadata']);
+            mockAction.getMetadata.and.returnValue(testMetadata);
+
+            testContext = { domainObject: mockDomainObject };
+
+            policy = new MovePolicy();
+        });
+
+        describe("for move actions", function () {
+            beforeEach(function () {
+                testMetadata.key = 'move';
+            });
+
+            describe("when an object is non-modifiable", function () {
+                beforeEach(function () {
+                    mockType.hasFeature.and.returnValue(false);
+                });
+
+                it("disallows the action", function () {
+                    expect(policy.allow(mockAction, testContext)).toBe(false);
+                });
+            });
+
+            describe("when a parent is non-modifiable", function () {
+                beforeEach(function () {
+                    mockParentType.hasFeature.and.returnValue(false);
+                });
+
+                it("disallows the action", function () {
+                    expect(policy.allow(mockAction, testContext)).toBe(false);
+                });
+            });
+
+            describe("when an object and its parent are modifiable", function () {
+                it("allows the action", function () {
+                    expect(policy.allow(mockAction, testContext)).toBe(true);
+                });
+            });
+        });
+
+        describe("for other actions", function () {
+            beforeEach(function () {
+                testMetadata.key = 'foo';
+            });
+
+            it("simply allows the action", function () {
+                expect(policy.allow(mockAction, testContext)).toBe(true);
+                mockType.hasFeature.and.returnValue(false);
+                expect(policy.allow(mockAction, testContext)).toBe(true);
+                mockParentType.hasFeature.and.returnValue(false);
+                expect(policy.allow(mockAction, testContext)).toBe(true);
+            });
+        });
+    });
+});
--- a/platform/entanglement/test/services/MockMoveService.js
+++ b/platform/entanglement/test/services/MockMoveService.js
@@ -0,0 +1,96 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2020, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is 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.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(
+    function () {
+
+        /**
+         * MockMoveService provides the same interface as the moveService,
+         * returning promises where it would normally do so.  At it's core,
+         * it is a jasmine spy object, but it also tracks the promises it
+         * returns and provides shortcut methods for resolving those promises
+         * synchronously.
+         *
+         * Usage:
+         *
+         * ```javascript
+         * var moveService = new MockMoveService();
+         *
+         * // validate is a standard jasmine spy.
+         * moveService.validate.and.returnValue(true);
+         * var isValid = moveService.validate(object, parentCandidate);
+         * expect(isValid).toBe(true);
+         *
+         * // perform returns promises and tracks them.
+         * var whenCopied = jasmine.createSpy('whenCopied');
+         * moveService.perform(object, parentObject).then(whenCopied);
+         * expect(whenCopied).not.toHaveBeenCalled();
+         * moveService.perform.calls.mostRecent().resolve('someArg');
+         * expect(whenCopied).toHaveBeenCalledWith('someArg');
+         * ```
+         */
+        function MockMoveService() {
+            // track most recent call of a function,
+            // perform automatically returns
+            var mockMoveService = jasmine.createSpyObj(
+                'MockMoveService',
+                [
+                    'validate',
+                    'perform'
+                ]
+            );
+
+            mockMoveService.perform.and.callFake(() => {
+                var performPromise,
+                    callExtensions,
+                    spy;
+
+                performPromise = jasmine.createSpyObj(
+                    'performPromise',
+                    ['then']
+                );
+
+                callExtensions = {
+                    promise: performPromise,
+                    resolve: function (resolveWith) {
+                        performPromise.then.calls.all().forEach(function (call) {
+                            call.args[0](resolveWith);
+                        });
+                    }
+                };
+
+                spy = mockMoveService.perform;
+
+                Object.keys(callExtensions).forEach(function (key) {
+                    spy.calls.mostRecent()[key] = callExtensions[key];
+                    spy.calls.all()[spy.calls.count() - 1][key] = callExtensions[key];
+                });
+
+                return performPromise;
+            });
+
+            return mockMoveService;
+        }
+
+        return MockMoveService;
+    }
+);
--- a/platform/entanglement/test/services/MoveServiceSpec.js
+++ b/platform/entanglement/test/services/MoveServiceSpec.js
@@ -0,0 +1,260 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2020, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is 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.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(
+    [
+        '../../src/services/MoveService',
+        '../services/MockLinkService',
+        '../DomainObjectFactory',
+        '../ControlledPromise'
+    ],
+    function (
+        MoveService,
+        MockLinkService,
+        domainObjectFactory,
+        ControlledPromise
+    ) {
+
+        xdescribe("MoveService", function () {
+
+            var moveService,
+                policyService,
+                object,
+                objectContextCapability,
+                currentParent,
+                parentCandidate,
+                linkService;
+
+            beforeEach(function () {
+                objectContextCapability = jasmine.createSpyObj(
+                    'objectContextCapability',
+                    [
+                        'getParent'
+                    ]
+                );
+
+                object = domainObjectFactory({
+                    name: 'object',
+                    id: 'a',
+                    capabilities: {
+                        context: objectContextCapability,
+                        type: { type: 'object' }
+                    }
+                });
+
+                currentParent = domainObjectFactory({
+                    name: 'currentParent',
+                    id: 'b'
+                });
+
+                objectContextCapability.getParent.and.returnValue(currentParent);
+
+                parentCandidate = domainObjectFactory({
+                    name: 'parentCandidate',
+                    model: { composition: [] },
+                    id: 'c',
+                    capabilities: {
+                        type: { type: 'parentCandidate' }
+                    }
+                });
+                policyService = jasmine.createSpyObj(
+                    'policyService',
+                    ['allow']
+                );
+                linkService = new MockLinkService();
+                policyService.allow.and.returnValue(true);
+                moveService = new MoveService(policyService, linkService);
+            });
+
+            describe("validate", function () {
+                var validate;
+
+                beforeEach(function () {
+                    validate = function () {
+                        return moveService.validate(object, parentCandidate);
+                    };
+                });
+
+                it("does not allow an invalid parent", function () {
+                    parentCandidate = undefined;
+                    expect(validate()).toBe(false);
+                    parentCandidate = {};
+                    expect(validate()).toBe(false);
+                });
+
+                it("does not allow moving to current parent", function () {
+                    parentCandidate.id = currentParent.id = 'xyz';
+                    expect(validate()).toBe(false);
+                });
+
+                it("does not allow moving to self", function () {
+                    object.id = parentCandidate.id = 'xyz';
+                    expect(validate()).toBe(false);
+                });
+
+                it("does not allow moving to the same location", function () {
+                    object.id = 'abc';
+                    parentCandidate.model.composition = ['abc'];
+                    expect(validate()).toBe(false);
+                });
+
+                describe("defers to policyService", function () {
+
+                    it("calls policy service with correct args", function () {
+                        validate();
+                        expect(policyService.allow).toHaveBeenCalledWith(
+                            "composition",
+                            parentCandidate,
+                            object
+                        );
+                    });
+
+                    it("and returns false", function () {
+                        policyService.allow.and.returnValue(false);
+                        expect(validate()).toBe(false);
+                    });
+
+                    it("and returns true", function () {
+                        policyService.allow.and.returnValue(true);
+                        expect(validate()).toBe(true);
+                    });
+                });
+            });
+
+            describe("perform", function () {
+
+                var actionCapability,
+                    locationCapability,
+                    locationPromise,
+                    newParent,
+                    moveResult;
+
+                beforeEach(function () {
+                    newParent = parentCandidate;
+
+                    actionCapability = jasmine.createSpyObj(
+                        'actionCapability',
+                        ['perform']
+                    );
+
+                    locationCapability = jasmine.createSpyObj(
+                        'locationCapability',
+                        [
+                            'isOriginal',
+                            'setPrimaryLocation',
+                            'getContextualLocation'
+                        ]
+                    );
+
+                    locationPromise = new ControlledPromise();
+                    locationCapability.setPrimaryLocation
+                        .and.returnValue(locationPromise);
+
+                    object = domainObjectFactory({
+                        name: 'object',
+                        capabilities: {
+                            action: actionCapability,
+                            location: locationCapability,
+                            context: objectContextCapability,
+                            type: { type: 'object' }
+                        }
+                    });
+                    moveResult = moveService.perform(object, newParent);
+                });
+
+                it("links object to newParent", function () {
+                    expect(linkService.perform).toHaveBeenCalledWith(
+                        object,
+                        newParent
+                    );
+                });
+
+                it("returns a promise", function () {
+                    expect(moveResult.then).toEqual(jasmine.any(Function));
+                });
+
+                it("waits for result of link", function () {
+                    expect(linkService.perform.calls.mostRecent().promise.then)
+                        .toHaveBeenCalledWith(jasmine.any(Function));
+                });
+
+                it("throws an error when performed on invalid inputs", function () {
+                    function perform() {
+                        moveService.perform(object, newParent);
+                    }
+
+                    spyOn(moveService, "validate");
+                    moveService.validate.and.returnValue(true);
+                    expect(perform).not.toThrow();
+                    moveService.validate.and.returnValue(false);
+                    expect(perform).toThrow();
+                });
+
+                describe("when moving an original", function () {
+                    beforeEach(function () {
+                        locationCapability.getContextualLocation
+                            .and.returnValue('new-location');
+                        locationCapability.isOriginal.and.returnValue(true);
+                        linkService.perform.calls.mostRecent().promise.resolve();
+                    });
+
+                    it("updates location", function () {
+                        expect(locationCapability.setPrimaryLocation)
+                            .toHaveBeenCalledWith('new-location');
+                    });
+
+                    describe("after location update", function () {
+                        beforeEach(function () {
+                            locationPromise.resolve();
+                        });
+
+                        it("removes object from parent without user warning dialog", function () {
+                            expect(actionCapability.perform)
+                                .toHaveBeenCalledWith('remove', true);
+                        });
+
+                    });
+
+                });
+
+                describe("when moving a link", function () {
+                    beforeEach(function () {
+                        locationCapability.isOriginal.and.returnValue(false);
+                        linkService.perform.calls.mostRecent().promise.resolve();
+                    });
+
+                    it("does not update location", function () {
+                        expect(locationCapability.setPrimaryLocation)
+                            .not
+                            .toHaveBeenCalled();
+                    });
+
+                    it("removes object from parent without user warning dialog", function () {
+                        expect(actionCapability.perform)
+                            .toHaveBeenCalledWith('remove', true);
+                    });
+                });
+
+            });
+        });
+    }
+);
--- a/platform/features/clock/res/templates/clock.html
+++ b/platform/features/clock/res/templates/clock.html
@@ -19,7 +19,7 @@
 this source code distribution or the Licensing information page available
 at runtime from the About dialog for additional information.
 -->
-<div class="c-clock l-time-display u-style-receiver js-style-receiver" ng-controller="ClockController as clock">
+<div class="c-clock l-time-display" ng-controller="ClockController as clock">
 	<div class="c-clock__timezone">
 		{{clock.zone()}}
 	</div>
--- a/platform/features/clock/res/templates/timer.html
+++ b/platform/features/clock/res/templates/timer.html
@@ -19,7 +19,7 @@
 this source code distribution or the Licensing information page available
 at runtime from the About dialog for additional information.
 -->
-<div class="c-timer u-style-receiver js-style-receiver is-{{timer.timerState}}" ng-controller="TimerController as timer">
+<div class="c-timer is-{{timer.timerState}}" ng-controller="TimerController as timer">
    <div class="c-timer__controls">
        <button ng-click="timer.clickStopButton()"
                ng-hide="timer.timerState == 'stopped'"
--- a/src/MCT.js
+++ b/src/MCT.js
@@ -46,8 +46,6 @@ define([
    './api/Branding',
    './plugins/licenses/plugin',
    './plugins/remove/plugin',
-    './plugins/move/plugin',
-    './plugins/duplicate/plugin',
    'vue'
 ], function (
    EventEmitter,
@@ -75,8 +73,6 @@ define([
    BrandingAPI,
    LicensesPlugin,
    RemoveActionPlugin,
-    MoveActionPlugin,
-    DuplicateActionPlugin,
    Vue
 ) {
    /**
@@ -250,8 +246,6 @@ define([

        this.actions = new api.ActionsAPI(this);

-        this.status = new api.StatusAPI(this);
-
        this.router = new ApplicationRouter();

        this.branding = BrandingAPI.default;
@@ -267,8 +261,6 @@ define([
        this.install(LegacyIndicatorsPlugin());
        this.install(LicensesPlugin.default());
        this.install(RemoveActionPlugin.default());
-        this.install(MoveActionPlugin.default());
-        this.install(DuplicateActionPlugin.default());
        this.install(this.plugins.FolderView());
        this.install(this.plugins.Tabs());
        this.install(ImageryPlugin.default());
@@ -282,7 +274,6 @@ define([
        this.install(this.plugins.NotificationIndicator());
        this.install(this.plugins.NewFolderAction());
        this.install(this.plugins.ViewDatumAction());
-        this.install(this.plugins.ObjectInterceptors());
    }

    MCT.prototype = Object.create(EventEmitter.prototype);
--- a/src/api/actions/ActionCollection.js
+++ b/src/api/actions/ActionCollection.js
@@ -24,14 +24,13 @@ import EventEmitter from 'EventEmitter';
 import _ from 'lodash';

 class ActionCollection extends EventEmitter {
-    constructor(applicableActions, objectPath, view, openmct, skipEnvironmentObservers) {
+    constructor(applicableActions, objectPath, view, openmct) {
        super();

        this.applicableActions = applicableActions;
        this.openmct = openmct;
        this.objectPath = objectPath;
        this.view = view;
-        this.skipEnvironmentObservers = skipEnvironmentObservers;
        this.objectUnsubscribes = [];

        let debounceOptions = {
@@ -42,12 +41,10 @@ class ActionCollection extends EventEmitter {
        this._updateActions = _.debounce(this._updateActions.bind(this), 150, debounceOptions);
        this._update = _.debounce(this._update.bind(this), 150, debounceOptions);

-        if (!skipEnvironmentObservers) {
-            this._observeObjectPath();
-            this.openmct.editor.on('isEditing', this._updateActions);
-        }
-
+        this._observeObjectPath();
        this._initializeActions();
+
+        this.openmct.editor.on('isEditing', this._updateActions);
    }

    disable(actionKeys) {
@@ -87,15 +84,11 @@ class ActionCollection extends EventEmitter {
    }

    destroy() {
-        super.removeAllListeners();
+        this.objectUnsubscribes.forEach(unsubscribe => {
+            unsubscribe();
+        });

-        if (!this.skipEnvironmentObservers) {
-            this.objectUnsubscribes.forEach(unsubscribe => {
-                unsubscribe();
-            });
-
-            this.openmct.editor.off('isEditing', this._updateActions);
-        }
+        this.openmct.editor.off('isEditing', this._updateActions);

        this.emit('destroy', this.view);
    }
@@ -130,10 +123,6 @@ class ActionCollection extends EventEmitter {
        return statusBarActions;
    }

-    getActionsObject() {
-        return this.applicableActions;
-    }
-
    _update() {
        this.emit('update', this.applicableActions);
    }
--- a/src/api/actions/ActionsAPI.js
+++ b/src/api/actions/ActionsAPI.js
@@ -44,12 +44,34 @@ class ActionsAPI extends EventEmitter {
    }

    get(objectPath, view) {
-        if (view) {
+        let viewContext = view && view.getViewContext && view.getViewContext() || {};

-            return this._getCachedActionCollection(objectPath, view) || this._newActionCollection(objectPath, view, true);
+        if (view && !viewContext.skipCache) {
+            let cachedActionCollection = this._actionCollections.get(view);
+
+            if (cachedActionCollection) {
+                return cachedActionCollection;
+            } else {
+                let applicableActions = this._applicableActions(objectPath, view);
+                let actionCollection = new ActionCollection(applicableActions, objectPath, view, this._openmct);
+
+                this._actionCollections.set(view, actionCollection);
+                actionCollection.on('destroy', this._updateCachedActionCollections);
+
+                return actionCollection;
+            }
        } else {
+            let applicableActions = this._applicableActions(objectPath, view);

-            return this._newActionCollection(objectPath, view, true);
+            Object.keys(applicableActions).forEach(key => {
+                let action = applicableActions[key];
+
+                action.callBack = () => {
+                    return action.invoke(objectPath, view);
+                };
+            });
+
+            return applicableActions;
        }
    }

@@ -57,27 +79,6 @@ class ActionsAPI extends EventEmitter {
        this._groupOrder = groupArray;
    }

-    _get(objectPath, view) {
-        let actionCollection = this._newActionCollection(objectPath, view);
-
-        this._actionCollections.set(view, actionCollection);
-        actionCollection.on('destroy', this._updateCachedActionCollections);
-
-        return actionCollection;
-    }
-
-    _getCachedActionCollection(objectPath, view) {
-        let cachedActionCollection = this._actionCollections.get(view);
-
-        return cachedActionCollection;
-    }
-
-    _newActionCollection(objectPath, view, skipEnvironmentObservers) {
-        let applicableActions = this._applicableActions(objectPath, view);
-
-        return new ActionCollection(applicableActions, objectPath, view, this._openmct, skipEnvironmentObservers);
-    }
-
    _updateCachedActionCollections(key) {
        if (this._actionCollections.has(key)) {
            let actionCollection = this._actionCollections.get(key);
--- a/src/api/actions/ActionsAPISpec.js
+++ b/src/api/actions/ActionsAPISpec.js
@@ -1,113 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2020, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is 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.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-import ActionsAPI from './ActionsAPI';
-import { createOpenMct, resetApplicationState } from '../../utils/testing';
-
-describe('The Actions API', () => {
-    let openmct;
-    let actionsAPI;
-    let mockAction;
-    let mockObjectPath;
-    let mockViewContext1;
-
-    beforeEach(() => {
-        openmct = createOpenMct();
-        actionsAPI = new ActionsAPI(openmct);
-        mockAction = {
-            name: 'Test Action',
-            key: 'test-action',
-            cssClass: 'test-action',
-            description: 'This is a test action',
-            group: 'action',
-            priority: 9,
-            appliesTo: (objectPath, view = {}) => {
-                if (view.getViewContext) {
-                    let viewContext = view.getViewContext();
-
-                    return viewContext.onlyAppliesToTestCase;
-                } else if (objectPath.length) {
-                    return objectPath[0].type === 'fake-folder';
-                }
-
-                return false;
-            },
-            invoke: () => {
-            }
-        };
-        mockObjectPath = [
-            {
-                name: 'mock folder',
-                type: 'fake-folder',
-                identifier: {
-                    key: 'mock-folder',
-                    namespace: ''
-                }
-            },
-            {
-                name: 'mock parent folder',
-                type: 'fake-folder',
-                identifier: {
-                    key: 'mock-parent-folder',
-                    namespace: ''
-                }
-            }
-        ];
-        mockViewContext1 = {
-            getViewContext: () => {
-                return {
-                    onlyAppliesToTestCase: true
-                };
-            }
-        };
-    });
-
-    afterEach(() => {
-        resetApplicationState(openmct);
-    });
-
-    describe("register method", () => {
-        it("adds action to ActionsAPI", () => {
-            actionsAPI.register(mockAction);
-
-            let actionCollection = actionsAPI.get(mockObjectPath, mockViewContext1);
-            let action = actionCollection.getActionsObject()[mockAction.key];
-
-            expect(action.key).toEqual(mockAction.key);
-            expect(action.name).toEqual(mockAction.name);
-        });
-    });
-
-    describe("get method", () => {
-        beforeEach(() => {
-            actionsAPI.register(mockAction);
-        });
-
-        it("returns an object with relevant actions when invoked with objectPath only", () => {
-            let actionCollection = actionsAPI.get(mockObjectPath, mockViewContext1);
-            let action = actionCollection.getActionsObject()[mockAction.key];
-
-            expect(action.key).toEqual(mockAction.key);
-            expect(action.name).toEqual(mockAction.name);
-        });
-    });
-});
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -30,8 +30,8 @@ define([
    './notifications/NotificationAPI',
    './Editor',
    './menu/MenuAPI',
-    './actions/ActionsAPI',
-    './status/StatusAPI'
+    './actions/ActionsAPI'
+
 ], function (
    TimeAPI,
    ObjectAPI,
@@ -42,8 +42,7 @@ define([
    NotificationAPI,
    EditorAPI,
    MenuAPI,
-    ActionsAPI,
-    StatusAPI
+    ActionsAPI
 ) {
    return {
        TimeAPI: TimeAPI,
@@ -55,7 +54,6 @@ define([
        NotificationAPI: NotificationAPI.default,
        EditorAPI: EditorAPI,
        MenuAPI: MenuAPI.default,
-        ActionsAPI: ActionsAPI.default,
-        StatusAPI: StatusAPI.default
+        ActionsAPI: ActionsAPI.default
    };
 });
--- a/src/api/menu/MenuAPISpec.js
+++ b/src/api/menu/MenuAPISpec.js
@@ -1,125 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2020, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is 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.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-import MenuAPI from './MenuAPI';
-import Menu from './menu';
-import { createOpenMct, resetApplicationState } from '../../utils/testing';
-
-describe ('The Menu API', () => {
-    let openmct;
-    let menuAPI;
-    let actionsArray;
-    let x;
-    let y;
-    let result;
-
-    beforeEach(() => {
-        openmct = createOpenMct();
-        menuAPI = new MenuAPI(openmct);
-        actionsArray = [
-            {
-                name: 'Test Action 1',
-                cssClass: 'test-css-class-1',
-                description: 'This is a test action',
-                callBack: () => {
-                    result = 'Test Action 1 Invoked';
-                }
-            },
-            {
-                name: 'Test Action 2',
-                cssClass: 'test-css-class-2',
-                description: 'This is a test action',
-                callBack: () => {
-                    result = 'Test Action 2 Invoked';
-                }
-            }
-        ];
-        x = 8;
-        y = 16;
-    });
-
-    afterEach(() => {
-        resetApplicationState(openmct);
-    });
-
-    describe("showMenu method", () => {
-        it("creates an instance of Menu when invoked", () => {
-            menuAPI.showMenu(x, y, actionsArray);
-
-            expect(menuAPI.menuComponent).toBeInstanceOf(Menu);
-        });
-
-        describe("creates a menu component", () => {
-            let menuComponent;
-            let vueComponent;
-
-            beforeEach(() => {
-                menuAPI.showMenu(x, y, actionsArray);
-                vueComponent = menuAPI.menuComponent.component;
-                menuComponent = document.querySelector(".c-menu");
-
-                spyOn(vueComponent, '$destroy');
-            });
-
-            it("renders a menu component in the expected x and y coordinates", () => {
-                let boundingClientRect = menuComponent.getBoundingClientRect();
-                let left = boundingClientRect.left;
-                let top = boundingClientRect.top;
-
-                expect(left).toEqual(x);
-                expect(top).toEqual(y);
-            });
-
-            it("with all the actions passed in", () => {
-                expect(menuComponent).toBeDefined();
-
-                let listItems = menuComponent.children[0].children;
-
-                expect(listItems.length).toEqual(actionsArray.length);
-            });
-
-            it("with click-able menu items, that will invoke the correct callBacks", () => {
-                let listItem1 = menuComponent.children[0].children[0];
-
-                listItem1.click();
-
-                expect(result).toEqual("Test Action 1 Invoked");
-            });
-
-            it("dismisses the menu when action is clicked on", () => {
-                let listItem1 = menuComponent.children[0].children[0];
-
-                listItem1.click();
-
-                let menu = document.querySelector('.c-menu');
-
-                expect(menu).toBeNull();
-            });
-
-            it("invokes the destroy method when menu is dismissed", () => {
-                document.body.click();
-
-                expect(vueComponent.$destroy).toHaveBeenCalled();
-            });
-        });
-    });
-});
--- a/src/api/objects/InterceptorRegistry.js
+++ b/src/api/objects/InterceptorRegistry.js
@@ -1,66 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2020, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is 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.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-export default class InterceptorRegistry {
-    /**
-     * A InterceptorRegistry maintains the definitions for different interceptors that may be invoked on domain objects.
-     * @interface InterceptorRegistry
-     * @memberof module:openmct
-     */
-    constructor() {
-        this.interceptors = [];
-    }
-
-    /**
-     * @interface InterceptorDef
-     * @property {function} appliesTo function that determines if this interceptor should be called for the given identifier/object
-     * @property {function} invoke function that transforms the provided domain object and returns the transformed domain object
-     * @property {function} priority the priority for this interceptor. A higher number returned has more weight than a lower number
-     * @memberof module:openmct InterceptorRegistry#
-     */
-
-    /**
-     * Register a new object interceptor.
-     *
-     * @param {module:openmct.InterceptorDef} interceptorDef the interceptor to add
-     * @method addInterceptor
-     * @memberof module:openmct.InterceptorRegistry#
-     */
-    addInterceptor(interceptorDef) {
-        //TODO: sort by priority
-        this.interceptors.push(interceptorDef);
-    }
-
-    /**
-     * Retrieve all interceptors applicable to a domain object.
-     * @method getInterceptors
-     * @returns [module:openmct.InterceptorDef] the registered interceptors for this identifier/object
-     * @memberof module:openmct.InterceptorRegistry#
-     */
-    getInterceptors(identifier, object) {
-        return this.interceptors.filter(interceptor => {
-            return typeof interceptor.appliesTo === 'function'
-                && interceptor.appliesTo(identifier, object);
-        });
-    }
-
-}
-
--- a/src/api/objects/InterceptorRegistrySpec.js
+++ b/src/api/objects/InterceptorRegistrySpec.js
--- a/src/api/objects/ObjectAPI.js
+++ b/src/api/objects/ObjectAPI.js
@@ -26,7 +26,6 @@ define([
    './MutableObject',
    './RootRegistry',
    './RootObjectProvider',
-    './InterceptorRegistry',
    'EventEmitter'
 ], function (
    _,
@@ -34,7 +33,6 @@ define([
    MutableObject,
    RootRegistry,
    RootObjectProvider,
-    InterceptorRegistry,
    EventEmitter
 ) {

@@ -50,7 +48,6 @@ define([
        this.rootRegistry = new RootRegistry();
        this.rootProvider = new RootObjectProvider.default(this.rootRegistry);
        this.cache = {};
-        this.interceptorRegistry = new InterceptorRegistry.default();
    }

    /**
@@ -180,10 +177,6 @@ define([

        return objectPromise.then(result => {
            delete this.cache[keystring];
-            const interceptors = this.listGetInterceptors(identifier, result);
-            interceptors.forEach(interceptor => {
-                result = interceptor.invoke(identifier, result);
-            });

            return result;
        });
@@ -319,27 +312,6 @@ define([
        });
    };

-    /**
-     * Register an object interceptor that transforms a domain object requested via module:openmct.ObjectAPI.get
-     * The domain object will be transformed after it is retrieved from the persistence store
-     * The domain object will be transformed only if the interceptor is applicable to that domain object as defined by the InterceptorDef
-     *
-     * @param {module:openmct.InterceptorDef} interceptorDef the interceptor definition to add
-     * @method addGetInterceptor
-     * @memberof module:openmct.InterceptorRegistry#
-     */
-    ObjectAPI.prototype.addGetInterceptor = function (interceptorDef) {
-        this.interceptorRegistry.addInterceptor(interceptorDef);
-    };
-
-    /**
-     * Retrieve the interceptors for a given domain object.
-     * @private
-     */
-    ObjectAPI.prototype.listGetInterceptors = function (identifier, object) {
-        return this.interceptorRegistry.getInterceptors(identifier, object);
-    };
-
    /**
     * Uniquely identifies a domain object.
     *
--- a/src/api/objects/ObjectAPISpec.js
+++ b/src/api/objects/ObjectAPISpec.js
@@ -63,51 +63,12 @@ describe("The Object API", () => {
    describe("The get function", () => {
        describe("when a provider is available", () => {
            let mockProvider;
-            let mockInterceptor;
-            let anotherMockInterceptor;
-            let notApplicableMockInterceptor;
            beforeEach(() => {
                mockProvider = jasmine.createSpyObj("mock provider", [
                    "get"
                ]);
                mockProvider.get.and.returnValue(Promise.resolve(mockDomainObject));
-
-                mockInterceptor = jasmine.createSpyObj("mock interceptor", [
-                    "appliesTo",
-                    "invoke"
-                ]);
-                mockInterceptor.appliesTo.and.returnValue(true);
-                mockInterceptor.invoke.and.callFake((identifier, object) => {
-                    return Object.assign({
-                        changed: true
-                    }, object);
-                });
-
-                anotherMockInterceptor = jasmine.createSpyObj("another mock interceptor", [
-                    "appliesTo",
-                    "invoke"
-                ]);
-                anotherMockInterceptor.appliesTo.and.returnValue(true);
-                anotherMockInterceptor.invoke.and.callFake((identifier, object) => {
-                    return Object.assign({
-                        alsoChanged: true
-                    }, object);
-                });
-
-                notApplicableMockInterceptor = jasmine.createSpyObj("not applicable mock interceptor", [
-                    "appliesTo",
-                    "invoke"
-                ]);
-                notApplicableMockInterceptor.appliesTo.and.returnValue(false);
-                notApplicableMockInterceptor.invoke.and.callFake((identifier, object) => {
-                    return Object.assign({
-                        shouldNotBeChanged: true
-                    }, object);
-                });
                objectAPI.addProvider(TEST_NAMESPACE, mockProvider);
-                objectAPI.addGetInterceptor(mockInterceptor);
-                objectAPI.addGetInterceptor(anotherMockInterceptor);
-                objectAPI.addGetInterceptor(notApplicableMockInterceptor);
            });

            it("Caches multiple requests for the same object", () => {
@@ -117,15 +78,6 @@ describe("The Object API", () => {
                objectAPI.get(mockDomainObject.identifier);
                expect(mockProvider.get.calls.count()).toBe(1);
            });
-
-            it("applies any applicable interceptors", () => {
-                expect(mockDomainObject.changed).toBeUndefined();
-                objectAPI.get(mockDomainObject.identifier).then((object) => {
-                    expect(object.changed).toBeTrue();
-                    expect(object.alsoChanged).toBeTrue();
-                    expect(object.shouldNotBeChanged).toBeUndefined();
-                });
-            });
        });
    });
 });
--- a/src/api/status/StatusAPI.js
+++ b/src/api/status/StatusAPI.js
@@ -1,67 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2020, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is 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.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-import EventEmitter from 'EventEmitter';
-
-export default class StatusAPI extends EventEmitter {
-    constructor(openmct) {
-        super();
-
-        this._openmct = openmct;
-        this._statusCache = {};
-
-        this.get = this.get.bind(this);
-        this.set = this.set.bind(this);
-        this.observe = this.observe.bind(this);
-    }
-
-    get(identifier) {
-        let keyString = this._openmct.objects.makeKeyString(identifier);
-
-        return this._statusCache[keyString];
-    }
-
-    set(identifier, value) {
-        let keyString = this._openmct.objects.makeKeyString(identifier);
-
-        this._statusCache[keyString] = value;
-        this.emit(keyString, value);
-    }
-
-    delete(identifier) {
-        let keyString = this._openmct.objects.makeKeyString(identifier);
-
-        this._statusCache[keyString] = undefined;
-        this.emit(keyString, undefined);
-        delete this._statusCache[keyString];
-    }
-
-    observe(identifier, callback) {
-        let key = this._openmct.objects.makeKeyString(identifier);
-
-        this.on(key, callback);
-
-        return () => {
-            this.off(key, callback);
-        };
-    }
-}
--- a/src/api/status/StatusAPISpec.js
+++ b/src/api/status/StatusAPISpec.js
@@ -1,85 +0,0 @@
-import StatusAPI from './StatusAPI.js';
-import { createOpenMct, resetApplicationState } from '../../utils/testing';
-
-describe("The Status API", () => {
-    let statusAPI;
-    let openmct;
-    let identifier;
-    let status;
-    let status2;
-    let callback;
-
-    beforeEach(() => {
-        openmct = createOpenMct();
-        statusAPI = new StatusAPI(openmct);
-        identifier = {
-            namespace: "test-namespace",
-            key: "test-key"
-        };
-        status = "test-status";
-        status2 = 'test-status-deux';
-        callback = jasmine.createSpy('callback', (statusUpdate) => statusUpdate);
-    });
-
-    afterEach(() => {
-        resetApplicationState(openmct);
-    });
-
-    describe("set function", () => {
-        it("sets status for identifier", () => {
-            statusAPI.set(identifier, status);
-
-            let resultingStatus = statusAPI.get(identifier);
-
-            expect(resultingStatus).toEqual(status);
-        });
-    });
-
-    describe("get function", () => {
-        it("returns status for identifier", () => {
-            statusAPI.set(identifier, status2);
-
-            let resultingStatus = statusAPI.get(identifier);
-
-            expect(resultingStatus).toEqual(status2);
-        });
-    });
-
-    describe("delete function", () => {
-        it("deletes status for identifier", () => {
-            statusAPI.set(identifier, status);
-
-            let resultingStatus = statusAPI.get(identifier);
-            expect(resultingStatus).toEqual(status);
-
-            statusAPI.delete(identifier);
-            resultingStatus = statusAPI.get(identifier);
-
-            expect(resultingStatus).toBeUndefined();
-        });
-    });
-
-    describe("observe function", () => {
-
-        it("allows callbacks to be attached to status set and delete events", () => {
-            let unsubscribe = statusAPI.observe(identifier, callback);
-            statusAPI.set(identifier, status);
-
-            expect(callback).toHaveBeenCalledWith(status);
-
-            statusAPI.delete(identifier);
-
-            expect(callback).toHaveBeenCalledWith(undefined);
-            unsubscribe();
-        });
-
-        it("returns a unsubscribe function", () => {
-            let unsubscribe = statusAPI.observe(identifier, callback);
-            unsubscribe();
-
-            statusAPI.set(identifier, status);
-
-            expect(callback).toHaveBeenCalledTimes(0);
-        });
-    });
-});
--- a/src/api/telemetry/TelemetryAPI.js
+++ b/src/api/telemetry/TelemetryAPI.js
@@ -21,14 +21,12 @@
 *****************************************************************************/

 define([
-    '../../plugins/displayLayout/CustomStringFormatter',
    './TelemetryMetadataManager',
    './TelemetryValueFormatter',
    './DefaultMetadataProvider',
    'objectUtils',
    'lodash'
 ], function (
-    CustomStringFormatter,
    TelemetryMetadataManager,
    TelemetryValueFormatter,
    DefaultMetadataProvider,
@@ -144,17 +142,6 @@ define([
        this.valueFormatterCache = new WeakMap();
    }

-    /**
-     * Return Custom String Formatter
-     *
-     * @param {Object} valueMetadata valueMetadata for given telemetry object
-     * @param {string} format custom formatter string (eg: %.4f, &lts etc.)
-     * @returns {CustomStringFormatter}
-     */
-    TelemetryAPI.prototype.customStringFormatter = function (valueMetadata, format) {
-        return new CustomStringFormatter.default(this.openmct, valueMetadata, format);
-    };
-
    /**
     * Return true if the given domainObject is a telemetry object.  A telemetry
     * object is any object which has telemetry metadata-- regardless of whether
@@ -413,17 +400,6 @@ define([
        return _.sortBy(options, sortKeys);
    };

-    /**
-     * @private
-     */
-    TelemetryAPI.prototype.getFormatService = function () {
-        if (!this.formatService) {
-            this.formatService = this.openmct.$injector.get('formatService');
-        }
-
-        return this.formatService;
-    };
-
    /**
     * Get a value formatter for a given valueMetadata.
     *
@@ -431,27 +407,19 @@ define([
     */
    TelemetryAPI.prototype.getValueFormatter = function (valueMetadata) {
        if (!this.valueFormatterCache.has(valueMetadata)) {
+            if (!this.formatService) {
+                this.formatService = this.openmct.$injector.get('formatService');
+            }
+
            this.valueFormatterCache.set(
                valueMetadata,
-                new TelemetryValueFormatter(valueMetadata, this.getFormatService())
+                new TelemetryValueFormatter(valueMetadata, this.formatService)
            );
        }

        return this.valueFormatterCache.get(valueMetadata);
    };

-    /**
-     * Get a value formatter for a given key.
-     * @param {string} key
-     *
-     * @returns {Format}
-     */
-    TelemetryAPI.prototype.getFormatter = function (key) {
-        const formatMap = this.getFormatService().formatMap;
-
-        return formatMap[key];
-    };
-
    /**
     * Get a format map of all value formatters for a given piece of telemetry
     * metadata.
--- a/src/plugins/LADTable/components/LADRow.vue
+++ b/src/plugins/LADTable/components/LADRow.vue
@@ -44,7 +44,6 @@
 <script>

 const CONTEXT_MENU_ACTIONS = [
-    'viewDatumAction',
    'viewHistoricalData',
    'remove'
 ];
@@ -130,7 +129,6 @@ export default {
            let limit;

            if (this.shouldUpdate(newTimestamp)) {
-                this.datum = datum;
                this.timestamp = newTimestamp;
                this.value = this.formats[this.valueKey].format(datum);
                limit = this.limitEvaluator.evaluate(datum, this.valueMetadata);
@@ -177,22 +175,8 @@ export default {
            this.resetValues();
            this.timestampKey = timeSystem.key;
        },
-        getView() {
-            return {
-                getViewContext: () => {
-                    return {
-                        viewHistoricalData: true,
-                        viewDatumAction: true,
-                        getDatum: () => {
-                            return this.datum;
-                        }
-                    };
-                }
-            };
-        },
        showContextMenu(event) {
-            let actionCollection = this.openmct.actions.get(this.currentObjectPath, this.getView());
-            let allActions = actionCollection.getActionsObject();
+            let allActions = this.openmct.actions.get(this.currentObjectPath, {}, {viewHistoricalData: true});
            let applicableActions = CONTEXT_MENU_ACTIONS.map(key => allActions[key]);

            this.openmct.menus.showMenu(event.x, event.y, applicableActions);
--- a/src/plugins/LADTable/components/LADTable.vue
+++ b/src/plugins/LADTable/components/LADTable.vue
@@ -21,7 +21,7 @@
 *****************************************************************************/

 <template>
-<div class="c-lad-table-wrapper u-style-receiver js-style-receiver">
+<div class="c-lad-table-wrapper">
    <table class="c-table c-lad-table">
        <thead>
            <tr>
--- a/src/plugins/autoflow/AutoflowTabularPluginSpec.js
+++ b/src/plugins/autoflow/AutoflowTabularPluginSpec.js
@@ -19,352 +19,342 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-import AutoflowTabularPlugin from './AutoflowTabularPlugin';
-import AutoflowTabularConstants from './AutoflowTabularConstants';
-import $ from 'zepto';
-import DOMObserver from './dom-observer';
-import {
-    createOpenMct,
-    resetApplicationState,
-    spyOnBuiltins
-} from 'utils/testing';

-describe("AutoflowTabularPlugin", () => {
-    let testType;
-    let testObject;
-    let mockmct;
+define([
+    './AutoflowTabularPlugin',
+    './AutoflowTabularConstants',
+    '../../MCT',
+    'zepto',
+    './dom-observer'
+], function (AutoflowTabularPlugin, AutoflowTabularConstants, MCT, $, DOMObserver) {
+    describe("AutoflowTabularPlugin", function () {
+        let testType;
+        let testObject;
+        let mockmct;

-    beforeEach(() => {
-        testType = "some-type";
-        testObject = { type: testType };
-        mockmct = createOpenMct();
-        spyOn(mockmct.composition, 'get');
-        spyOn(mockmct.objectViews, 'addProvider');
-        spyOn(mockmct.telemetry, 'getMetadata');
-        spyOn(mockmct.telemetry, 'getValueFormatter');
-        spyOn(mockmct.telemetry, 'limitEvaluator');
-        spyOn(mockmct.telemetry, 'request');
-        spyOn(mockmct.telemetry, 'subscribe');
+        beforeEach(function () {
+            testType = "some-type";
+            testObject = { type: testType };
+            mockmct = new MCT();
+            spyOn(mockmct.composition, 'get');
+            spyOn(mockmct.objectViews, 'addProvider');
+            spyOn(mockmct.telemetry, 'getMetadata');
+            spyOn(mockmct.telemetry, 'getValueFormatter');
+            spyOn(mockmct.telemetry, 'limitEvaluator');
+            spyOn(mockmct.telemetry, 'request');
+            spyOn(mockmct.telemetry, 'subscribe');

-        const plugin = new AutoflowTabularPlugin({ type: testType });
-        plugin(mockmct);
-    });
-
-    afterEach(() => {
-        resetApplicationState(mockmct);
-    });
-
-    it("installs a view provider", () => {
-        expect(mockmct.objectViews.addProvider).toHaveBeenCalled();
-    });
-
-    describe("installs a view provider which", () => {
-        let provider;
-
-        beforeEach(() => {
-            provider =
-                mockmct.objectViews.addProvider.calls.mostRecent().args[0];
+            const plugin = new AutoflowTabularPlugin({ type: testType });
+            plugin(mockmct);
        });

-        it("applies its view to the type from options", () => {
-            expect(provider.canView(testObject)).toBe(true);
+        it("installs a view provider", function () {
+            expect(mockmct.objectViews.addProvider).toHaveBeenCalled();
        });

-        it("does not apply to other types", () => {
-            expect(provider.canView({ type: 'foo' })).toBe(false);
-        });
+        describe("installs a view provider which", function () {
+            let provider;

-        describe("provides a view which", () => {
-            let testKeys;
-            let testChildren;
-            let testContainer;
-            let testHistories;
-            let mockComposition;
-            let mockMetadata;
-            let mockEvaluator;
-            let mockUnsubscribes;
-            let callbacks;
-            let view;
-            let domObserver;
+            beforeEach(function () {
+                provider =
+                    mockmct.objectViews.addProvider.calls.mostRecent().args[0];
+            });

-            function waitsForChange() {
-                return new Promise(function (resolve) {
-                    window.requestAnimationFrame(resolve);
+            it("applies its view to the type from options", function () {
+                expect(provider.canView(testObject)).toBe(true);
+            });
+
+            it("does not apply to other types", function () {
+                expect(provider.canView({ type: 'foo' })).toBe(false);
+            });
+
+            describe("provides a view which", function () {
+                let testKeys;
+                let testChildren;
+                let testContainer;
+                let testHistories;
+                let mockComposition;
+                let mockMetadata;
+                let mockEvaluator;
+                let mockUnsubscribes;
+                let callbacks;
+                let view;
+                let domObserver;
+
+                function waitsForChange() {
+                    return new Promise(function (resolve) {
+                        window.requestAnimationFrame(resolve);
+                    });
+                }
+
+                function emitEvent(mockEmitter, type, event) {
+                    mockEmitter.on.calls.all().forEach(function (call) {
+                        if (call.args[0] === type) {
+                            call.args[1](event);
+                        }
+                    });
+                }
+
+                beforeEach(function () {
+                    callbacks = {};
+
+                    testObject = { type: 'some-type' };
+                    testKeys = ['abc', 'def', 'xyz'];
+                    testChildren = testKeys.map(function (key) {
+                        return {
+                            identifier: {
+                                namespace: "test",
+                                key: key
+                            },
+                            name: "Object " + key
+                        };
+                    });
+                    testContainer = $('<div>')[0];
+                    domObserver = new DOMObserver(testContainer);
+
+                    testHistories = testKeys.reduce(function (histories, key, index) {
+                        histories[key] = {
+                            key: key,
+                            range: index + 10,
+                            domain: key + index
+                        };
+
+                        return histories;
+                    }, {});
+
+                    mockComposition =
+                        jasmine.createSpyObj('composition', ['load', 'on', 'off']);
+                    mockMetadata =
+                        jasmine.createSpyObj('metadata', ['valuesForHints']);
+
+                    mockEvaluator = jasmine.createSpyObj('evaluator', ['evaluate']);
+                    mockUnsubscribes = testKeys.reduce(function (map, key) {
+                        map[key] = jasmine.createSpy('unsubscribe-' + key);
+
+                        return map;
+                    }, {});
+
+                    mockmct.composition.get.and.returnValue(mockComposition);
+                    mockComposition.load.and.callFake(function () {
+                        testChildren.forEach(emitEvent.bind(null, mockComposition, 'add'));
+
+                        return Promise.resolve(testChildren);
+                    });
+
+                    mockmct.telemetry.getMetadata.and.returnValue(mockMetadata);
+                    mockmct.telemetry.getValueFormatter.and.callFake(function (metadatum) {
+                        const mockFormatter = jasmine.createSpyObj('formatter', ['format']);
+                        mockFormatter.format.and.callFake(function (datum) {
+                            return datum[metadatum.hint];
+                        });
+
+                        return mockFormatter;
+                    });
+                    mockmct.telemetry.limitEvaluator.and.returnValue(mockEvaluator);
+                    mockmct.telemetry.subscribe.and.callFake(function (obj, callback) {
+                        const key = obj.identifier.key;
+                        callbacks[key] = callback;
+
+                        return mockUnsubscribes[key];
+                    });
+                    mockmct.telemetry.request.and.callFake(function (obj, request) {
+                        const key = obj.identifier.key;
+
+                        return Promise.resolve([testHistories[key]]);
+                    });
+                    mockMetadata.valuesForHints.and.callFake(function (hints) {
+                        return [{ hint: hints[0] }];
+                    });
+
+                    view = provider.view(testObject);
+                    view.show(testContainer);
+
+                    return waitsForChange();
                });
-            }

-            function emitEvent(mockEmitter, type, event) {
-                mockEmitter.on.calls.all().forEach((call) => {
-                    if (call.args[0] === type) {
-                        call.args[1](event);
+                afterEach(function () {
+                    domObserver.destroy();
+                });
+
+                it("populates its container", function () {
+                    expect(testContainer.children.length > 0).toBe(true);
+                });
+
+                describe("when rows have been populated", function () {
+                    function rowsMatch() {
+                        const rows = $(testContainer).find(".l-autoflow-row").length;
+
+                        return rows === testChildren.length;
                    }
-                });
-            }

-            beforeEach((done) => {
-                callbacks = {};
-
-                spyOnBuiltins(['requestAnimationFrame']);
-                window.requestAnimationFrame.and.callFake((callBack) => {
-                    callBack();
-                });
-
-                testObject = { type: 'some-type' };
-                testKeys = ['abc', 'def', 'xyz'];
-                testChildren = testKeys.map((key) => {
-                    return {
-                        identifier: {
-                            namespace: "test",
-                            key: key
-                        },
-                        name: "Object " + key
-                    };
-                });
-                testContainer = $('<div>')[0];
-                domObserver = new DOMObserver(testContainer);
-
-                testHistories = testKeys.reduce((histories, key, index) => {
-                    histories[key] = {
-                        key: key,
-                        range: index + 10,
-                        domain: key + index
-                    };
-
-                    return histories;
-                }, {});
-
-                mockComposition =
-                    jasmine.createSpyObj('composition', ['load', 'on', 'off']);
-                mockMetadata =
-                    jasmine.createSpyObj('metadata', ['valuesForHints']);
-
-                mockEvaluator = jasmine.createSpyObj('evaluator', ['evaluate']);
-                mockUnsubscribes = testKeys.reduce((map, key) => {
-                    map[key] = jasmine.createSpy('unsubscribe-' + key);
-
-                    return map;
-                }, {});
-
-                mockmct.composition.get.and.returnValue(mockComposition);
-                mockComposition.load.and.callFake(() => {
-                    testChildren.forEach(emitEvent.bind(null, mockComposition, 'add'));
-
-                    return Promise.resolve(testChildren);
-                });
-
-                mockmct.telemetry.getMetadata.and.returnValue(mockMetadata);
-                mockmct.telemetry.getValueFormatter.and.callFake((metadatum) => {
-                    const mockFormatter = jasmine.createSpyObj('formatter', ['format']);
-                    mockFormatter.format.and.callFake((datum) => {
-                        return datum[metadatum.hint];
+                    it("shows one row per child object", function () {
+                        return domObserver.when(rowsMatch);
                    });

-                    return mockFormatter;
-                });
-                mockmct.telemetry.limitEvaluator.and.returnValue(mockEvaluator);
-                mockmct.telemetry.subscribe.and.callFake((obj, callback) => {
-                    const key = obj.identifier.key;
-                    callbacks[key] = callback;
+                    it("adds rows on composition change", function () {
+                        const child = {
+                            identifier: {
+                                namespace: "test",
+                                key: "123"
+                            },
+                            name: "Object 123"
+                        };
+                        testChildren.push(child);
+                        emitEvent(mockComposition, 'add', child);

-                    return mockUnsubscribes[key];
-                });
-                mockmct.telemetry.request.and.callFake((obj, request) => {
-                    const key = obj.identifier.key;
-
-                    return Promise.resolve([testHistories[key]]);
-                });
-                mockMetadata.valuesForHints.and.callFake((hints) => {
-                    return [{ hint: hints[0] }];
-                });
-
-                view = provider.view(testObject);
-                view.show(testContainer);
-
-                return done();
-            });
-
-            afterEach(() => {
-                domObserver.destroy();
-            });
-
-            it("populates its container", () => {
-                expect(testContainer.children.length > 0).toBe(true);
-            });
-
-            describe("when rows have been populated", () => {
-                function rowsMatch() {
-                    const rows = $(testContainer).find(".l-autoflow-row").length;
-
-                    return rows === testChildren.length;
-                }
-
-                it("shows one row per child object", () => {
-                    return domObserver.when(rowsMatch);
-                });
-
-                // it("adds rows on composition change", () => {
-                //     const child = {
-                //         identifier: {
-                //             namespace: "test",
-                //             key: "123"
-                //         },
-                //         name: "Object 123"
-                //     };
-                //     testChildren.push(child);
-                //     emitEvent(mockComposition, 'add', child);
-
-                //     return domObserver.when(rowsMatch);
-                // });
-
-                it("removes rows on composition change", () => {
-                    const child = testChildren.pop();
-                    emitEvent(mockComposition, 'remove', child.identifier);
-
-                    return domObserver.when(rowsMatch);
-                });
-            });
-
-            it("removes subscriptions when destroyed", () => {
-                testKeys.forEach((key) => {
-                    expect(mockUnsubscribes[key]).not.toHaveBeenCalled();
-                });
-                view.destroy();
-                testKeys.forEach((key) => {
-                    expect(mockUnsubscribes[key]).toHaveBeenCalled();
-                });
-            });
-
-            it("provides a button to change column width", () => {
-                const initialWidth = AutoflowTabularConstants.INITIAL_COLUMN_WIDTH;
-                const nextWidth =
-                    initialWidth + AutoflowTabularConstants.COLUMN_WIDTH_STEP;
-
-                expect($(testContainer).find('.l-autoflow-col').css('width'))
-                    .toEqual(initialWidth + 'px');
-
-                $(testContainer).find('.change-column-width').click();
-
-                function widthHasChanged() {
-                    const width = $(testContainer).find('.l-autoflow-col').css('width');
-
-                    return width !== initialWidth + 'px';
-                }
-
-                return domObserver.when(widthHasChanged)
-                    .then(() => {
-                        expect($(testContainer).find('.l-autoflow-col').css('width'))
-                            .toEqual(nextWidth + 'px');
+                        return domObserver.when(rowsMatch);
                    });
-            });

-            it("subscribes to all child objects", () => {
-                testKeys.forEach((key) => {
-                    expect(callbacks[key]).toEqual(jasmine.any(Function));
-                });
-            });
+                    it("removes rows on composition change", function () {
+                        const child = testChildren.pop();
+                        emitEvent(mockComposition, 'remove', child.identifier);

-            it("displays historical telemetry", () => {
-                function rowTextDefined() {
-                    return $(testContainer).find(".l-autoflow-item").filter(".r").text() !== "";
-                }
-
-                return domObserver.when(rowTextDefined).then(() => {
-                    testKeys.forEach((key, index) => {
-                        const datum = testHistories[key];
-                        const $cell = $(testContainer).find(".l-autoflow-row").eq(index).find(".r");
-                        expect($cell.text()).toEqual(String(datum.range));
-                    });
-                });
-            });
-
-            it("displays incoming telemetry", () => {
-                const testData = testKeys.map((key, index) => {
-                    return {
-                        key: key,
-                        range: index * 100,
-                        domain: key + index
-                    };
-                });
-
-                testData.forEach((datum) => {
-                    callbacks[datum.key](datum);
-                });
-
-                return waitsForChange().then(() => {
-                    testData.forEach((datum, index) => {
-                        const $cell = $(testContainer).find(".l-autoflow-row").eq(index).find(".r");
-                        expect($cell.text()).toEqual(String(datum.range));
-                    });
-                });
-            });
-
-            it("updates classes for limit violations", () => {
-                const testClass = "some-limit-violation";
-                mockEvaluator.evaluate.and.returnValue({ cssClass: testClass });
-                testKeys.forEach((key) => {
-                    callbacks[key]({
-                        range: 'foo',
-                        domain: 'bar'
+                        return domObserver.when(rowsMatch);
                    });
                });

-                return waitsForChange().then(() => {
-                    testKeys.forEach((datum, index) => {
-                        const $cell = $(testContainer).find(".l-autoflow-row").eq(index).find(".r");
-                        expect($cell.hasClass(testClass)).toBe(true);
+                it("removes subscriptions when destroyed", function () {
+                    testKeys.forEach(function (key) {
+                        expect(mockUnsubscribes[key]).not.toHaveBeenCalled();
+                    });
+                    view.destroy();
+                    testKeys.forEach(function (key) {
+                        expect(mockUnsubscribes[key]).toHaveBeenCalled();
                    });
                });
-            });

-            it("automatically flows to new columns", () => {
-                const rowHeight = AutoflowTabularConstants.ROW_HEIGHT;
-                const sliderHeight = AutoflowTabularConstants.SLIDER_HEIGHT;
-                const count = testKeys.length;
-                const $container = $(testContainer);
-                let promiseChain = Promise.resolve();
+                it("provides a button to change column width", function () {
+                    const initialWidth = AutoflowTabularConstants.INITIAL_COLUMN_WIDTH;
+                    const nextWidth =
+                        initialWidth + AutoflowTabularConstants.COLUMN_WIDTH_STEP;

-                function columnsHaveAutoflowed() {
-                    const itemsHeight = $container.find('.l-autoflow-items').height();
-                    const availableHeight = itemsHeight - sliderHeight;
-                    const availableRows = Math.max(Math.floor(availableHeight / rowHeight), 1);
-                    const columns = Math.ceil(count / availableRows);
+                    expect($(testContainer).find('.l-autoflow-col').css('width'))
+                        .toEqual(initialWidth + 'px');

-                    return $container.find('.l-autoflow-col').length === columns;
-                }
+                    $(testContainer).find('.change-column-width').click();

-                $container.find('.abs').css({
-                    position: 'absolute',
-                    left: '0px',
-                    right: '0px',
-                    top: '0px',
-                    bottom: '0px'
+                    function widthHasChanged() {
+                        const width = $(testContainer).find('.l-autoflow-col').css('width');
+
+                        return width !== initialWidth + 'px';
+                    }
+
+                    return domObserver.when(widthHasChanged)
+                        .then(function () {
+                            expect($(testContainer).find('.l-autoflow-col').css('width'))
+                                .toEqual(nextWidth + 'px');
+                        });
                });
-                $container.css({ position: 'absolute' });

-                $container.appendTo(document.body);
-
-                function setHeight(height) {
-                    $container.css('height', height + 'px');
-
-                    return domObserver.when(columnsHaveAutoflowed);
-                }
-
-                for (let height = 0; height < rowHeight * count * 2; height += rowHeight / 2) {
-                    // eslint-disable-next-line no-invalid-this
-                    promiseChain = promiseChain.then(setHeight.bind(this, height));
-                }
-
-                return promiseChain.then(() => {
-                    $container.remove();
+                it("subscribes to all child objects", function () {
+                    testKeys.forEach(function (key) {
+                        expect(callbacks[key]).toEqual(jasmine.any(Function));
+                    });
                });
-            });

-            it("loads composition exactly once", () => {
-                const testObj = testChildren.pop();
-                emitEvent(mockComposition, 'remove', testObj.identifier);
-                testChildren.push(testObj);
-                emitEvent(mockComposition, 'add', testObj);
-                expect(mockComposition.load.calls.count()).toEqual(1);
+                it("displays historical telemetry", function () {
+                    function rowTextDefined() {
+                        return $(testContainer).find(".l-autoflow-item").filter(".r").text() !== "";
+                    }
+
+                    return domObserver.when(rowTextDefined).then(function () {
+                        testKeys.forEach(function (key, index) {
+                            const datum = testHistories[key];
+                            const $cell = $(testContainer).find(".l-autoflow-row").eq(index).find(".r");
+                            expect($cell.text()).toEqual(String(datum.range));
+                        });
+                    });
+                });
+
+                it("displays incoming telemetry", function () {
+                    const testData = testKeys.map(function (key, index) {
+                        return {
+                            key: key,
+                            range: index * 100,
+                            domain: key + index
+                        };
+                    });
+
+                    testData.forEach(function (datum) {
+                        callbacks[datum.key](datum);
+                    });
+
+                    return waitsForChange().then(function () {
+                        testData.forEach(function (datum, index) {
+                            const $cell = $(testContainer).find(".l-autoflow-row").eq(index).find(".r");
+                            expect($cell.text()).toEqual(String(datum.range));
+                        });
+                    });
+                });
+
+                it("updates classes for limit violations", function () {
+                    const testClass = "some-limit-violation";
+                    mockEvaluator.evaluate.and.returnValue({ cssClass: testClass });
+                    testKeys.forEach(function (key) {
+                        callbacks[key]({
+                            range: 'foo',
+                            domain: 'bar'
+                        });
+                    });
+
+                    return waitsForChange().then(function () {
+                        testKeys.forEach(function (datum, index) {
+                            const $cell = $(testContainer).find(".l-autoflow-row").eq(index).find(".r");
+                            expect($cell.hasClass(testClass)).toBe(true);
+                        });
+                    });
+                });
+
+                it("automatically flows to new columns", function () {
+                    const rowHeight = AutoflowTabularConstants.ROW_HEIGHT;
+                    const sliderHeight = AutoflowTabularConstants.SLIDER_HEIGHT;
+                    const count = testKeys.length;
+                    const $container = $(testContainer);
+                    let promiseChain = Promise.resolve();
+
+                    function columnsHaveAutoflowed() {
+                        const itemsHeight = $container.find('.l-autoflow-items').height();
+                        const availableHeight = itemsHeight - sliderHeight;
+                        const availableRows = Math.max(Math.floor(availableHeight / rowHeight), 1);
+                        const columns = Math.ceil(count / availableRows);
+
+                        return $container.find('.l-autoflow-col').length === columns;
+                    }
+
+                    $container.find('.abs').css({
+                        position: 'absolute',
+                        left: '0px',
+                        right: '0px',
+                        top: '0px',
+                        bottom: '0px'
+                    });
+                    $container.css({ position: 'absolute' });
+
+                    $container.appendTo(document.body);
+
+                    function setHeight(height) {
+                        $container.css('height', height + 'px');
+
+                        return domObserver.when(columnsHaveAutoflowed);
+                    }
+
+                    for (let height = 0; height < rowHeight * count * 2; height += rowHeight / 2) {
+                        // eslint-disable-next-line no-invalid-this
+                        promiseChain = promiseChain.then(setHeight.bind(this, height));
+                    }
+
+                    return promiseChain.then(function () {
+                        $container.remove();
+                    });
+                });
+
+                it("loads composition exactly once", function () {
+                    const testObj = testChildren.pop();
+                    emitEvent(mockComposition, 'remove', testObj.identifier);
+                    testChildren.push(testObj);
+                    emitEvent(mockComposition, 'add', testObj);
+                    expect(mockComposition.load.calls.count()).toEqual(1);
+                });
            });
        });
    });
--- a/src/plugins/condition/components/conditionals.scss
+++ b/src/plugins/condition/components/conditionals.scss
@@ -50,7 +50,6 @@
 .c-cs {
    display: flex;
    flex-direction: column;
-    flex: 1 1 auto;
    height: 100%;
    overflow: hidden;

--- a/src/plugins/condition/components/inspector/StyleEditor.vue
+++ b/src/plugins/condition/components/inspector/StyleEditor.vue
@@ -21,22 +21,21 @@
 *****************************************************************************/

 <template>
-<div class="c-style has-local-controls c-toolbar">
-    <div class="c-style__controls">
-        <div :class="[
-                 { 'is-style-invisible': styleItem.style && styleItem.style.isStyleInvisible },
-                 { 'c-style-thumb--mixed': mixedStyles.indexOf('backgroundColor') > -1 }
-             ]"
-             :style="[styleItem.style.imageUrl ? { backgroundImage:'url(' + styleItem.style.imageUrl + ')'} : itemStyle ]"
-             class="c-style-thumb"
+<div class="c-style">
+    <span :class="[
+              { 'is-style-invisible': styleItem.style.isStyleInvisible },
+              { 'c-style-thumb--mixed': mixedStyles.indexOf('backgroundColor') > -1 }
+          ]"
+          :style="[styleItem.style.imageUrl ? { backgroundImage:'url(' + styleItem.style.imageUrl + ')'} : itemStyle ]"
+          class="c-style-thumb"
+    >
+        <span class="c-style-thumb__text"
+              :class="{ 'hide-nice': !hasProperty(styleItem.style.color) }"
        >
-            <span class="c-style-thumb__text"
-                  :class="{ 'hide-nice': !hasProperty(styleItem.style.color) }"
-            >
-                ABC
-            </span>
-        </div>
-
+            ABC
+        </span>
+    </span>
+    <span class="c-toolbar">
        <toolbar-color-picker v-if="hasProperty(styleItem.style.border)"
                              class="c-style__toolbar-button--border-color u-menu-to--center"
                              :options="borderColorOption"
@@ -62,14 +61,7 @@
                               :options="isStyleInvisibleOption"
                               @change="updateStyleValue"
        />
-    </div>
-
-    <!-- Save Styles -->
-    <toolbar-button v-if="canSaveStyle"
-                    class="c-style__toolbar-button--save c-local-controls--show-on-hover c-icon-button c-icon-button--major"
-                    :options="saveOptions"
-                    @click="saveItemStyle()"
-    />
+    </span>
 </div>
 </template>

@@ -88,11 +80,12 @@ export default {
        ToolbarColorPicker,
        ToolbarToggleButton
    },
-    inject: ['openmct'],
+    inject: [
+        'openmct'
+    ],
    props: {
        isEditing: {
-            type: Boolean,
-            required: true
+            type: Boolean
        },
        mixedStyles: {
            type: Array,
@@ -100,10 +93,6 @@ export default {
                return [];
            }
        },
-        nonSpecificFontProperties: {
-            type: Array,
-            required: true
-        },
        styleItem: {
            type: Object,
            required: true
@@ -193,16 +182,7 @@ export default {
                    }
                ]
            };
-        },
-        saveOptions() {
-            return {
-                icon: 'icon-save',
-                title: 'Save style',
-                isEditing: this.isEditing
-            };
-        },
-        canSaveStyle() {
-            return this.isEditing && !this.mixedStyles.length && !this.nonSpecificFontProperties.length;
+
        }
    },
    methods: {
@@ -236,9 +216,6 @@ export default {
            }

            this.$emit('persist', this.styleItem, item.property);
-        },
-        saveItemStyle() {
-            this.$emit('save-style', this.itemStyle);
        }
    }
 };
--- a/src/plugins/condition/components/inspector/StylesView.vue
+++ b/src/plugins/condition/components/inspector/StylesView.vue
@@ -31,11 +31,6 @@
        <div class="c-inspect-styles__header">
            Object Style
        </div>
-        <FontStyleEditor
-            v-if="canStyleFont"
-            :font-style="consolidatedFontStyle"
-            @set-font-property="setFontProperty"
-        />
        <div class="c-inspect-styles__content">
            <div v-if="staticStyle"
                 class="c-inspect-styles__style"
@@ -44,9 +39,7 @@
                              :style-item="staticStyle"
                              :is-editing="allowEditing"
                              :mixed-styles="mixedStyles"
-                              :non-specific-font-properties="nonSpecificFontProperties"
                              @persist="updateStaticStyle"
-                              @save-style="saveStyle"
                />
            </div>
            <button
@@ -65,11 +58,10 @@
        </div>
        <div class="c-inspect-styles__content c-inspect-styles__condition-set">
            <a v-if="conditionSetDomainObject"
-               class="c-object-label"
+               class="c-object-label icon-conditional"
               :href="navigateToPath"
               @click="navigateOrPreview"
            >
-                <span class="c-object-label__type-icon icon-conditional"></span>
                <span class="c-object-label__name">{{ conditionSetDomainObject.name }}</span>
            </a>
            <template v-if="allowEditing">
@@ -88,12 +80,6 @@
            </template>
        </div>

-        <FontStyleEditor
-            v-if="canStyleFont"
-            :font-style="consolidatedFontStyle"
-            @set-font-property="setFontProperty"
-        />
-
        <div v-if="conditionsLoaded"
             class="c-inspect-styles__conditions"
        >
@@ -111,10 +97,8 @@
                />
                <style-editor class="c-inspect-styles__editor"
                              :style-item="conditionStyle"
-                              :non-specific-font-properties="nonSpecificFontProperties"
                              :is-editing="allowEditing"
                              @persist="updateConditionalStyle"
-                              @save-style="saveStyle"
                />
            </div>
        </div>
@@ -124,7 +108,6 @@

 <script>

-import FontStyleEditor from '@/ui/inspector/styles/FontStyleEditor.vue';
 import StyleEditor from "./StyleEditor.vue";
 import PreviewAction from "@/ui/preview/PreviewAction.js";
 import { getApplicableStylesForItem, getConsolidatedStyleValues, getConditionSetIdentifierForItem } from "@/plugins/condition/utils/styleUtils";
@@ -133,30 +116,16 @@ import ConditionError from "@/plugins/condition/components/ConditionError.vue";
 import ConditionDescription from "@/plugins/condition/components/ConditionDescription.vue";
 import Vue from 'vue';

-const NON_SPECIFIC = '??';
-const NON_STYLEABLE_CONTAINER_TYPES = [
-    'layout',
-    'flexible-layout',
-    'tabs'
-];
-const NON_STYLEABLE_LAYOUT_ITEM_TYPES = [
-    'line-view',
-    'box-view',
-    'image-view'
-];
-
 export default {
    name: 'StylesView',
    components: {
-        FontStyleEditor,
        StyleEditor,
        ConditionError,
        ConditionDescription
    },
    inject: [
        'openmct',
-        'selection',
-        'stylesManager'
+        'selection'
    ],
    data() {
        return {
@@ -170,80 +139,19 @@ export default {
            conditionsLoaded: false,
            navigateToPath: '',
            selectedConditionId: '',
-            items: [],
-            domainObject: undefined,
-            consolidatedFontStyle: {}
+            locked: false
        };
    },
    computed: {
-        locked() {
-            return this.selection.some(selectionPath => {
-                const self = selectionPath[0].context.item;
-                const parent = selectionPath.length > 1 ? selectionPath[1].context.item : undefined;
-
-                return (self && self.locked) || (parent && parent.locked);
-            });
-        },
        allowEditing() {
            return this.isEditing && !this.locked;
-        },
-        styleableFontItems() {
-            return this.selection.filter(selectionPath => {
-                const item = selectionPath[0].context.item;
-                const itemType = item && item.type;
-                const layoutItem = selectionPath[0].context.layoutItem;
-                const layoutItemType = layoutItem && layoutItem.type;
-
-                if (itemType && NON_STYLEABLE_CONTAINER_TYPES.includes(itemType)) {
-                    return false;
-                }
-
-                if (layoutItemType && NON_STYLEABLE_LAYOUT_ITEM_TYPES.includes(layoutItemType)) {
-                    return false;
-                }
-
-                return true;
-            });
-        },
-        computedconsolidatedFontStyle() {
-            let consolidatedFontStyle;
-            const styles = [];
-
-            this.styleableFontItems.forEach(styleable => {
-                const fontStyle = this.getFontStyle(styleable[0]);
-
-                styles.push(fontStyle);
-            });
-
-            if (styles.length) {
-                const hasConsolidatedFontSize = styles.length && styles.every((fontStyle, i, arr) => fontStyle.fontSize === arr[0].fontSize);
-                const hasConsolidatedFont = styles.length && styles.every((fontStyle, i, arr) => fontStyle.font === arr[0].font);
-
-                consolidatedFontStyle = {
-                    fontSize: hasConsolidatedFontSize ? styles[0].fontSize : NON_SPECIFIC,
-                    font: hasConsolidatedFont ? styles[0].font : NON_SPECIFIC
-                };
-            }
-
-            return consolidatedFontStyle;
-        },
-        nonSpecificFontProperties() {
-            if (!this.consolidatedFontStyle) {
-                return [];
-            }
-
-            return Object.keys(this.consolidatedFontStyle).filter(property => this.consolidatedFontStyle[property] === NON_SPECIFIC);
-        },
-        canStyleFont() {
-            return this.styleableFontItems.length && this.allowEditing;
        }
    },
    destroyed() {
        this.removeListeners();
-        this.openmct.editor.off('isEditing', this.setEditState);
-        this.stylesManager.off('styleSelected', this.applyStyleToSelection);
    },
    mounted() {
+        this.items = [];
        this.previewAction = new PreviewAction(this.openmct);
        this.isMultipleSelection = this.selection.length > 1;
        this.getObjectsAndItemsFromSelection();
@@ -258,10 +166,7 @@ export default {
            this.initializeStaticStyle();
        }

-        this.setConsolidatedFontStyle();
-
        this.openmct.editor.on('isEditing', this.setEditState);
-        this.stylesManager.on('styleSelected', this.applyStyleToSelection);
    },
    methods: {
        getObjectStyles() {
@@ -273,10 +178,10 @@ export default {
                }
            } else if (this.items.length) {
                const itemId = this.items[0].id;
-                if (this.domainObject && this.domainObject.configuration && this.domainObject.configuration.objectStyles && this.domainObject.configuration.objectStyles[itemId]) {
+                if (this.domainObject.configuration && this.domainObject.configuration.objectStyles && this.domainObject.configuration.objectStyles[itemId]) {
                    objectStyles = this.domainObject.configuration.objectStyles[itemId];
                }
-            } else if (this.domainObject && this.domainObject.configuration && this.domainObject.configuration.objectStyles) {
+            } else if (this.domainObject.configuration && this.domainObject.configuration.objectStyles) {
                objectStyles = this.domainObject.configuration.objectStyles;
            }

@@ -314,18 +219,6 @@ export default {
        isItemType(type, item) {
            return item && (item.type === type);
        },
-        canPersistObject(item) {
-            // for now the only way to tell if an object can be persisted is if it is creatable.
-            let creatable = false;
-            if (item) {
-                const type = this.openmct.types.get(item.type);
-                if (type && type.definition) {
-                    creatable = (type.definition.creatable === true);
-                }
-            }
-
-            return creatable;
-        },
        hasConditionalStyle(domainObject, layoutItem) {
            const id = layoutItem ? layoutItem.id : undefined;

@@ -342,8 +235,13 @@ export default {
            this.selection.forEach((selectionItem) => {
                const item = selectionItem[0].context.item;
                const layoutItem = selectionItem[0].context.layoutItem;
+                const layoutDomainObject = selectionItem[0].context.item;
                const isChildItem = selectionItem.length > 1;

+                if (layoutDomainObject && layoutDomainObject.locked) {
+                    this.locked = true;
+                }
+
                if (!isChildItem) {
                    domainObject = item;
                    itemStyle = getApplicableStylesForItem(item);
@@ -353,7 +251,7 @@ export default {
                } else {
                    this.canHide = true;
                    domainObject = selectionItem[1].context.item;
-                    if (item && !layoutItem || (this.isItemType('subobject-view', layoutItem) && this.canPersistObject(item))) {
+                    if (item && !layoutItem || this.isItemType('subobject-view', layoutItem)) {
                        subObjects.push(item);
                        itemStyle = getApplicableStylesForItem(item);
                        if (this.hasConditionalStyle(item)) {
@@ -377,7 +275,7 @@ export default {
            const {styles, mixedStyles} = getConsolidatedStyleValues(itemInitialStyles);
            this.initialStyles = styles;
            this.mixedStyles = mixedStyles;
-            // main layout
+
            this.domainObject = domainObject;
            this.removeListeners();
            if (this.domainObject) {
@@ -400,7 +298,6 @@ export default {
        isKeyItemId(key) {
            return (key !== 'styles')
                && (key !== 'staticStyle')
-                && (key !== 'fontStyle')
                && (key !== 'defaultConditionId')
                && (key !== 'selectedConditionId')
                && (key !== 'conditionSetIdentifier');
@@ -740,124 +637,6 @@ export default {
        },
        persist(domainObject, style) {
            this.openmct.objects.mutate(domainObject, 'configuration.objectStyles', style);
-        },
-        applyStyleToSelection(style) {
-            if (!this.allowEditing) {
-                return;
-            }
-
-            this.updateSelectionFontStyle(style);
-            this.updateSelectionStyle(style);
-        },
-        updateSelectionFontStyle(style) {
-            const fontSizeProperty = {
-                fontSize: style.fontSize
-            };
-            const fontProperty = {
-                font: style.font
-            };
-
-            this.setFontProperty(fontSizeProperty);
-            this.setFontProperty(fontProperty);
-        },
-        updateSelectionStyle(style) {
-            const foundStyle = this.findStyleByConditionId(this.selectedConditionId);
-
-            if (foundStyle && !this.isStaticAndConditionalStyles) {
-                Object.entries(style).forEach(([property, value]) => {
-                    if (foundStyle.style[property] !== undefined && foundStyle.style[property] !== value) {
-                        foundStyle.style[property] = value;
-                    }
-                });
-                this.getAndPersistStyles();
-            } else {
-                this.removeConditionSet();
-                Object.entries(style).forEach(([property, value]) => {
-                    if (this.staticStyle.style[property] !== undefined && this.staticStyle.style[property] !== value) {
-                        this.staticStyle.style[property] = value;
-                        this.getAndPersistStyles(property);
-                    }
-                });
-            }
-        },
-        saveStyle(style) {
-            const styleToSave = {
-                ...style,
-                ...this.consolidatedFontStyle
-            };
-
-            this.stylesManager.save(styleToSave);
-        },
-        setConsolidatedFontStyle() {
-            const styles = [];
-
-            this.styleableFontItems.forEach(styleable => {
-                const fontStyle = this.getFontStyle(styleable[0]);
-
-                styles.push(fontStyle);
-            });
-
-            if (styles.length) {
-                const hasConsolidatedFontSize = styles.length && styles.every((fontStyle, i, arr) => fontStyle.fontSize === arr[0].fontSize);
-                const hasConsolidatedFont = styles.length && styles.every((fontStyle, i, arr) => fontStyle.font === arr[0].font);
-
-                const fontSize = hasConsolidatedFontSize ? styles[0].fontSize : NON_SPECIFIC;
-                const font = hasConsolidatedFont ? styles[0].font : NON_SPECIFIC;
-
-                this.$set(this.consolidatedFontStyle, 'fontSize', fontSize);
-                this.$set(this.consolidatedFontStyle, 'font', font);
-            }
-        },
-        getFontStyle(selectionPath) {
-            const item = selectionPath.context.item;
-            const layoutItem = selectionPath.context.layoutItem;
-            let fontStyle = item && item.configuration && item.configuration.fontStyle;
-
-            // support for legacy where font styling in layouts only
-            if (!fontStyle) {
-                fontStyle = {
-                    fontSize: layoutItem && layoutItem.fontSize || 'default',
-                    font: layoutItem && layoutItem.font || 'default'
-                };
-            }
-
-            return fontStyle;
-        },
-        setFontProperty(fontStyleObject) {
-            let layoutDomainObject;
-            const [property, value] = Object.entries(fontStyleObject)[0];
-
-            this.styleableFontItems.forEach(styleable => {
-                if (!this.isLayoutObject(styleable)) {
-                    const fontStyle = this.getFontStyle(styleable[0]);
-                    fontStyle[property] = value;
-
-                    this.openmct.objects.mutate(styleable[0].context.item, 'configuration.fontStyle', fontStyle);
-                } else {
-                    // all layoutItems in this context will share same parent layout
-                    if (!layoutDomainObject) {
-                        layoutDomainObject = styleable[1].context.item;
-                    }
-
-                    // save layout item font style to parent layout configuration
-                    const layoutItemIndex = styleable[0].context.index;
-                    const layoutItemConfiguration = layoutDomainObject.configuration.items[layoutItemIndex];
-
-                    layoutItemConfiguration[property] = value;
-                }
-            });
-
-            if (layoutDomainObject) {
-                this.openmct.objects.mutate(layoutDomainObject, 'configuration.items', layoutDomainObject.configuration.items);
-            }
-
-            // sync vue component on font update
-            this.$set(this.consolidatedFontStyle, property, value);
-        },
-        isLayoutObject(selectionPath) {
-            const layoutItemType = selectionPath[0].context.layoutItem && selectionPath[0].context.layoutItem.type;
-
-            return layoutItemType && layoutItemType !== 'subobject-view';
        }
    }
 };
--- a/src/plugins/condition/components/inspector/conditional-styles.scss
+++ b/src/plugins/condition/components/inspector/conditional-styles.scss
@@ -40,11 +40,9 @@
    }

    &__condition-set {
-        align-items: baseline;
-        border-bottom: 1px solid $colorInteriorBorder;
        display: flex;
        flex-direction: row;
-        padding-bottom: $interiorMargin;
+        align-items: center;

        .c-object-label {
            flex: 1 1 auto;
@@ -55,10 +53,7 @@
        }
    }

-    &__style {
-        padding-bottom: $interiorMargin;
-    }
-
+    &__style,
    &__condition {
        padding: $interiorMargin;
    }
--- a/src/plugins/condition/pluginSpec.js
+++ b/src/plugins/condition/pluginSpec.js
@@ -146,8 +146,6 @@ describe('the plugin', function () {
        let displayLayoutItem;
        let lineLayoutItem;
        let boxLayoutItem;
-        let notCreatableObjectItem;
-        let notCreatableObject;
        let selection;
        let component;
        let styleViewComponentObject;
@@ -266,19 +264,6 @@ describe('the plugin', function () {
                            "stroke": "#717171",
                            "type": "line-view",
                            "id": "57d49a28-7863-43bd-9593-6570758916f0"
-                        },
-                        {
-                            "width": 32,
-                            "height": 18,
-                            "x": 36,
-                            "y": 8,
-                            "identifier": {
-                                "key": "~TEST~image",
-                                "namespace": "test-space"
-                            },
-                            "hasFrame": true,
-                            "type": "subobject-view",
-                            "id": "6d9fe81b-a3ce-4e59-b404-a4a0be1a5d85"
                        }
                    ],
                    "layoutGrid": [
@@ -312,52 +297,6 @@ describe('the plugin', function () {
                "type": "box-view",
                "id": "89b88746-d325-487b-aec4-11b79afff9e8"
            };
-            notCreatableObjectItem = {
-                "width": 32,
-                "height": 18,
-                "x": 36,
-                "y": 8,
-                "identifier": {
-                    "key": "~TEST~image",
-                    "namespace": "test-space"
-                },
-                "hasFrame": true,
-                "type": "subobject-view",
-                "id": "6d9fe81b-a3ce-4e59-b404-a4a0be1a5d85"
-            };
-            notCreatableObject = {
-                "identifier": {
-                    "key": "~TEST~image",
-                    "namespace": "test-space"
-                },
-                "name": "test~image",
-                "location": "test-space:~TEST",
-                "type": "test.image",
-                "telemetry": {
-                    "values": [
-                        {
-                            "key": "value",
-                            "name": "Value",
-                            "hints": {
-                                "image": 1,
-                                "priority": 0
-                            },
-                            "format": "image",
-                            "source": "value"
-                        },
-                        {
-                            "key": "utc",
-                            "source": "timestamp",
-                            "name": "Timestamp",
-                            "format": "iso",
-                            "hints": {
-                                "domain": 1,
-                                "priority": 1
-                            }
-                        }
-                    ]
-                }
-            };
            selection = [
                [{
                    context: {
@@ -377,19 +316,6 @@ describe('the plugin', function () {
                        "index": 0
                    }
                },
-                {
-                    context: {
-                        item: displayLayoutItem,
-                        "supportsMultiSelect": true
-                    }
-                }],
-                [{
-                    context: {
-                        "item": notCreatableObject,
-                        "layoutItem": notCreatableObjectItem,
-                        "index": 2
-                    }
-                },
                {
                    context: {
                        item: displayLayoutItem,
@@ -418,7 +344,7 @@ describe('the plugin', function () {
        });

        it('initializes the items in the view', () => {
-            expect(styleViewComponentObject.items.length).toBe(3);
+            expect(styleViewComponentObject.items.length).toBe(2);
        });

        it('initializes conditional styles', () => {
@@ -437,7 +363,7 @@ describe('the plugin', function () {

            return Vue.nextTick().then(() => {
                expect(styleViewComponentObject.domainObject.configuration.objectStyles).toBeDefined();
-                [boxLayoutItem, lineLayoutItem, notCreatableObjectItem].forEach((item) => {
+                [boxLayoutItem, lineLayoutItem].forEach((item) => {
                    const itemStyles = styleViewComponentObject.domainObject.configuration.objectStyles[item.id].styles;
                    expect(itemStyles.length).toBe(2);
                    const foundStyle = itemStyles.find((style) => {
@@ -459,7 +385,7 @@ describe('the plugin', function () {

            return Vue.nextTick().then(() => {
                expect(styleViewComponentObject.domainObject.configuration.objectStyles).toBeDefined();
-                [boxLayoutItem, lineLayoutItem, notCreatableObjectItem].forEach((item) => {
+                [boxLayoutItem, lineLayoutItem].forEach((item) => {
                    const itemStyle = styleViewComponentObject.domainObject.configuration.objectStyles[item.id].staticStyle;
                    expect(itemStyle).toBeDefined();
                    const applicableStyles = getApplicableStylesForItem(styleViewComponentObject.domainObject, item);
--- a/src/plugins/conditionWidget/components/ConditionWidget.vue
+++ b/src/plugins/conditionWidget/components/ConditionWidget.vue
@@ -22,7 +22,7 @@

 <template>
 <component :is="urlDefined ? 'a' : 'span'"
-           class="c-condition-widget u-style-receiver js-style-receiver"
+           class="c-condition-widget"
           :href="urlDefined ? internalDomainObject.url : null"
 >
    <div class="c-condition-widget__label">
--- a/src/plugins/displayLayout/CustomStringFormatter.js
+++ b/src/plugins/displayLayout/CustomStringFormatter.js
@@ -1,38 +0,0 @@
-import printj from 'printj';
-
-export default class CustomStringFormatter {
-    constructor(openmct, valueMetadata, itemFormat) {
-        this.openmct = openmct;
-
-        this.itemFormat = itemFormat;
-        this.valueMetadata = valueMetadata;
-    }
-
-    format(datum) {
-        if (!this.itemFormat) {
-            return;
-        }
-
-        if (!this.itemFormat.startsWith('&')) {
-            return printj.sprintf(this.itemFormat, datum[this.valueMetadata.key]);
-        }
-
-        try {
-            const key = this.itemFormat.slice(1);
-            const customFormatter = this.openmct.telemetry.getFormatter(key);
-            if (!customFormatter) {
-                throw new Error('Custom Formatter not found');
-            }
-
-            return customFormatter.format(datum[this.valueMetadata.key]);
-        } catch (e) {
-            console.error(e);
-
-            return datum[this.valueMetadata.key];
-        }
-    }
-
-    setFormat(itemFormat) {
-        this.itemFormat = itemFormat;
-    }
-}
--- a/src/plugins/displayLayout/CustomStringFormatterSpec.js
+++ b/src/plugins/displayLayout/CustomStringFormatterSpec.js
@@ -1,82 +0,0 @@
-import CustomStringFormatter from './CustomStringFormatter';
-import { createOpenMct, resetApplicationState } from 'utils/testing';
-
-const CUSTOM_FORMATS = [
-    {
-        key: 'sclk',
-        format: (value) => 2 * value
-    },
-    {
-        key: 'lts',
-        format: (value) => 3 * value
-    }
-];
-
-const valueMetadata = {
-    key: "sin",
-    name: "Sine",
-    unit: "Hz",
-    formatString: "%0.2f",
-    hints: {
-        range: 1,
-        priority: 3
-    },
-    source: "sin"
-};
-
-const datum = {
-    name: "1 Sine Wave Generator",
-    utc: 1603930354000,
-    yesterday: 1603843954000,
-    sin: 0.587785209686822,
-    cos: -0.8090170253297632
-};
-
-describe('CustomStringFormatter', function () {
-    let element;
-    let child;
-    let openmct;
-    let customStringFormatter;
-
-    beforeEach((done) => {
-        openmct = createOpenMct();
-
-        element = document.createElement('div');
-        child = document.createElement('div');
-        element.appendChild(child);
-        CUSTOM_FORMATS.forEach(openmct.telemetry.addFormat.bind({openmct}));
-        openmct.on('start', done);
-        openmct.startHeadless();
-
-        spyOn(openmct.telemetry, 'getFormatter');
-        openmct.telemetry.getFormatter.and.callFake((key) => CUSTOM_FORMATS.find(d => d.key === key));
-
-        customStringFormatter = new CustomStringFormatter(openmct, valueMetadata);
-    });
-
-    afterEach(() => {
-        return resetApplicationState(openmct);
-    });
-
-    it('adds custom format sclk', () => {
-        const format = openmct.telemetry.getFormatter('sclk');
-        expect(format.key).toEqual('sclk');
-    });
-
-    it('adds custom format lts', () => {
-        const format = openmct.telemetry.getFormatter('lts');
-        expect(format.key).toEqual('lts');
-    });
-
-    it('returns correct value for custom format sclk', () => {
-        customStringFormatter.setFormat('&sclk');
-        const value = customStringFormatter.format(datum, valueMetadata);
-        expect(datum.sin * 2).toEqual(value);
-    });
-
-    it('returns correct value for custom format lts', () => {
-        customStringFormatter.setFormat('&lts');
-        const value = customStringFormatter.format(datum, valueMetadata);
-        expect(datum.sin * 3).toEqual(value);
-    });
-});
--- a/src/plugins/displayLayout/DisplayLayoutToolbar.js
+++ b/src/plugins/displayLayout/DisplayLayoutToolbar.js
@@ -73,6 +73,7 @@ define(['lodash'], function (_) {
                        ]
                    }
                };
+
                const VIEW_TYPES = {
                    'telemetry-view': {
                        value: 'telemetry-view',
@@ -95,6 +96,7 @@ define(['lodash'], function (_) {
                        class: 'icon-tabular-realtime'
                    }
                };
+
                const APPLICABLE_VIEWS = {
                    'telemetry-view': [
                        VIEW_TYPES['telemetry.plot.overlay'],
@@ -388,6 +390,29 @@ define(['lodash'], function (_) {
                    }
                }

+                function getTextSizeMenu(selectedParent, selection) {
+                    const TEXT_SIZE = [8, 9, 10, 11, 12, 13, 14, 15, 16, 20, 24, 30, 36, 48, 72, 96, 128];
+
+                    return {
+                        control: "select-menu",
+                        domainObject: selectedParent,
+                        applicableSelectedItems: selection.filter(selectionPath => {
+                            let type = selectionPath[0].context.layoutItem.type;
+
+                            return type === 'text-view' || type === 'telemetry-view';
+                        }),
+                        property: function (selectionPath) {
+                            return getPath(selectionPath) + ".size";
+                        },
+                        title: "Set text size",
+                        options: TEXT_SIZE.map(size => {
+                            return {
+                                value: size + "px"
+                            };
+                        })
+                    };
+                }
+
                function getTextButton(selectedParent, selection) {
                    return {
                        control: "button",
@@ -398,7 +423,7 @@ define(['lodash'], function (_) {
                        property: function (selectionPath) {
                            return getPath(selectionPath);
                        },
-                        icon: "icon-pencil",
+                        icon: "icon-font",
                        title: "Edit text properties",
                        dialog: DIALOG_FORM.text
                    };
@@ -598,33 +623,6 @@ define(['lodash'], function (_) {
                    }
                }

-                function getToggleGridButton(selection, selectionPath) {
-                    const ICON_GRID_SHOW = 'icon-grid-on';
-                    const ICON_GRID_HIDE = 'icon-grid-off';
-
-                    let displayLayoutContext;
-
-                    if (selection.length === 1 && selectionPath === undefined) {
-                        displayLayoutContext = selection[0][0].context;
-                    } else {
-                        displayLayoutContext = selectionPath[1].context;
-                    }
-
-                    return {
-                        control: "button",
-                        domainObject: displayLayoutContext.item,
-                        icon: ICON_GRID_SHOW,
-                        method: function () {
-                            displayLayoutContext.toggleGrid();
-
-                            this.icon = this.icon === ICON_GRID_SHOW
-                                ? ICON_GRID_HIDE
-                                : ICON_GRID_SHOW;
-                        },
-                        secondary: true
-                    };
-                }
-
                function getSeparator() {
                    return {
                        control: "separator"
@@ -639,9 +637,7 @@ define(['lodash'], function (_) {
                }

                if (isMainLayoutSelected(selectedObjects[0])) {
-                    return [
-                        getToggleGridButton(selectedObjects),
-                        getAddButton(selectedObjects)];
+                    return [getAddButton(selectedObjects)];
                }

                let toolbar = {
@@ -653,11 +649,11 @@ define(['lodash'], function (_) {
                    'display-mode': [],
                    'telemetry-value': [],
                    'style': [],
+                    'text-style': [],
                    'position': [],
                    'duplicate': [],
                    'unit-toggle': [],
-                    'remove': [],
-                    'toggle-grid': []
+                    'remove': []
                };

                selectedObjects.forEach(selectionPath => {
@@ -703,6 +699,12 @@ define(['lodash'], function (_) {
                            toolbar['telemetry-value'] = [getTelemetryValueMenu(selectionPath, selectedObjects)];
                        }

+                        if (toolbar['text-style'].length === 0) {
+                            toolbar['text-style'] = [
+                                getTextSizeMenu(selectedParent, selectedObjects)
+                            ];
+                        }
+
                        if (toolbar.position.length === 0) {
                            toolbar.position = [
                                getStackOrder(selectedParent, selectionPath),
@@ -728,6 +730,12 @@ define(['lodash'], function (_) {
                            }
                        }
                    } else if (layoutItem.type === 'text-view') {
+                        if (toolbar['text-style'].length === 0) {
+                            toolbar['text-style'] = [
+                                getTextSizeMenu(selectedParent, selectedObjects)
+                            ];
+                        }
+
                        if (toolbar.position.length === 0) {
                            toolbar.position = [
                                getStackOrder(selectedParent, selectionPath),
@@ -792,10 +800,6 @@ define(['lodash'], function (_) {
                    if (toolbar.duplicate.length === 0) {
                        toolbar.duplicate = [getDuplicateButton(selectedParent, selectionPath, selectedObjects)];
                    }
-
-                    if (toolbar['toggle-grid'].length === 0) {
-                        toolbar['toggle-grid'] = [getToggleGridButton(selectedObjects, selectionPath)];
-                    }
                });

                let toolbarArray = Object.values(toolbar);
--- a/src/plugins/displayLayout/DisplayLayoutType.js
+++ b/src/plugins/displayLayout/DisplayLayoutType.js
@@ -56,28 +56,6 @@ define(function () {
                        1
                    ],
                    required: true
-                },
-                {
-                    name: "Horizontal size (px)",
-                    control: "numberfield",
-                    cssClass: "l-input-sm l-numeric",
-                    property: [
-                        "configuration",
-                        "layoutDimensions",
-                        0
-                    ],
-                    required: false
-                },
-                {
-                    name: "Vertical size (px)",
-                    control: "numberfield",
-                    cssClass: "l-input-sm l-numeric",
-                    property: [
-                        "configuration",
-                        "layoutDimensions",
-                        1
-                    ],
-                    required: false
                }
            ]
        };
--- a/src/plugins/displayLayout/actions/CopyToClipboardAction.js
+++ b/src/plugins/displayLayout/actions/CopyToClipboardAction.js
@@ -5,30 +5,29 @@ export default class CopyToClipboardAction {
        this.openmct = openmct;

        this.cssClass = 'icon-duplicate';
-        this.description = 'Copy value to clipboard';
+        this.description = 'Copy to Clipboard action';
        this.group = "action";
        this.key = 'copyToClipboard';
        this.name = 'Copy to Clipboard';
-        this.priority = 1;
+        this.priority = 9;
    }

-    invoke(objectPath, view = {}) {
-        const viewContext = view.getViewContext && view.getViewContext();
+    invoke(objectPath, viewContext) {
        const formattedValue = viewContext.formattedValueForCopy();
-
        clipboard.updateClipboard(formattedValue)
            .then(() => {
-                this.openmct.notifications.info(`Success : copied '${formattedValue}' to clipboard `);
+                this.openmct.notifications.info(`Success : copied to clipboard '${formattedValue}'`);
            })
            .catch(() => {
-                this.openmct.notifications.error(`Failed : to copy '${formattedValue}' to clipboard `);
+                this.openmct.notifications.error(`Failed : to copy to clipboard '${formattedValue}'`);
            });
    }

-    appliesTo(objectPath, view = {}) {
-        let viewContext = view.getViewContext && view.getViewContext();
+    appliesTo(objectPath, viewContext) {
+        if (viewContext && viewContext.getViewKey) {
+            return viewContext.getViewKey().includes('alphanumeric-format');
+        }

-        return viewContext && viewContext.formattedValueForCopy
-            && typeof viewContext.formattedValueForCopy === 'function';
+        return false;
    }
 }
--- a/src/plugins/displayLayout/components/BoxView.vue
+++ b/src/plugins/displayLayout/components/BoxView.vue
@@ -29,7 +29,7 @@
    @endMove="() => $emit('endMove')"
 >
    <div
-        class="c-box-view u-style-receiver js-style-receiver"
+        class="c-box-view"
        :class="[styleClass]"
        :style="style"
    ></div>
--- a/src/plugins/displayLayout/components/DisplayLayout.vue
+++ b/src/plugins/displayLayout/components/DisplayLayout.vue
@@ -22,7 +22,7 @@

 <template>
 <div
-    class="l-layout u-style-receiver js-style-receiver"
+    class="l-layout"
    :class="{
        'is-multi-selected': selectedLayoutItems.length > 1,
        'allow-editing': isEditing
@@ -31,19 +31,21 @@
    @click.capture="bypassSelection"
    @drop="handleDrop"
 >
-    <display-layout-grid
-        v-if="isEditing"
-        :grid-size="gridSize"
-        :show-grid="showGrid"
-    />
+    <!-- Background grid -->
    <div
-        v-if="shouldDisplayLayoutDimensions"
-        class="l-layout__dimensions"
-        :style="layoutDimensionsStyle"
+        v-if="isEditing"
+        class="l-layout__grid-holder c-grid"
    >
-        <div class="l-layout__dimensions-vals">
-            {{ layoutDimensions[0] }},{{ layoutDimensions[1] }}
-        </div>
+        <div
+            v-if="gridSize[0] >= 3"
+            class="c-grid__x l-grid l-grid-x"
+            :style="[{ backgroundSize: gridSize[0] + 'px 100%' }]"
+        ></div>
+        <div
+            v-if="gridSize[1] >= 3"
+            class="c-grid__y l-grid l-grid-y"
+            :style="[{ backgroundSize: '100%' + gridSize[1] + 'px' }]"
+        ></div>
    </div>
    <component
        :is="item.type"
@@ -79,7 +81,6 @@ import TextView from './TextView.vue';
 import LineView from './LineView.vue';
 import ImageView from './ImageView.vue';
 import EditMarquee from './EditMarquee.vue';
-import DisplayLayoutGrid from './DisplayLayoutGrid.vue';
 import _ from 'lodash';

 const TELEMETRY_IDENTIFIER_FUNCTIONS = {
@@ -126,7 +127,6 @@ const DUPLICATE_OFFSET = 3;

 let components = ITEM_TYPE_VIEW_MAP;
 components['edit-marquee'] = EditMarquee;
-components['display-layout-grid'] = DisplayLayoutGrid;

 function getItemDefinition(itemType, ...options) {
    let itemView = ITEM_TYPE_VIEW_MAP[itemType];
@@ -140,7 +140,6 @@ function getItemDefinition(itemType, ...options) {

 export default {
    components: components,
-    inject: ['openmct', 'options', 'objectPath'],
    props: {
        domainObject: {
            type: Object,
@@ -157,8 +156,7 @@ export default {
        return {
            internalDomainObject: domainObject,
            initSelectIndex: undefined,
-            selection: [],
-            showGrid: true
+            selection: []
        };
    },
    computed: {
@@ -173,23 +171,6 @@ export default {
                return this.itemIsInCurrentSelection(item);
            });
        },
-        layoutDimensions() {
-            return this.internalDomainObject.configuration.layoutDimensions;
-        },
-        shouldDisplayLayoutDimensions() {
-            return this.layoutDimensions
-                && this.layoutDimensions[0] > 0
-                && this.layoutDimensions[1] > 0;
-        },
-        layoutDimensionsStyle() {
-            const width = `${this.layoutDimensions[0]}px`;
-            const height = `${this.layoutDimensions[1]}px`;
-
-            return {
-                width,
-                height
-            };
-        },
        showMarquee() {
            let selectionPath = this.selection[0];
            let singleSelectedLine = this.selection.length === 1
@@ -198,13 +179,7 @@ export default {
            return this.isEditing && selectionPath && selectionPath.length > 1 && !singleSelectedLine;
        }
    },
-    watch: {
-        isEditing(value) {
-            if (value) {
-                this.showGrid = value;
-            }
-        }
-    },
+    inject: ['openmct', 'options', 'objectPath'],
    mounted() {
        this.unlisten = this.openmct.objects.observe(this.internalDomainObject, '*', function (obj) {
            this.internalDomainObject = JSON.parse(JSON.stringify(obj));
@@ -823,9 +798,6 @@ export default {

            this.removeItem(selection);
            this.initSelectIndex = this.layoutItems.length - 1; //restore selection
-        },
-        toggleGrid() {
-            this.showGrid = !this.showGrid;
        }
    }
 };
--- a/src/plugins/displayLayout/components/DisplayLayoutGrid.vue
+++ b/src/plugins/displayLayout/components/DisplayLayoutGrid.vue
@@ -1,34 +0,0 @@
-<template>
-<div
-    class="l-layout__grid-holder"
-    :class="{ 'c-grid': showGrid }"
->
-    <div
-        v-if="gridSize[0] >= 3"
-        class="c-grid__x l-grid l-grid-x"
-        :style="[{ backgroundSize: gridSize[0] + 'px 100%' }]"
-    ></div>
-    <div
-        v-if="gridSize[1] >= 3"
-        class="c-grid__y l-grid l-grid-y"
-        :style="[{ backgroundSize: '100%' + gridSize[1] + 'px' }]"
-    ></div>
-</div>
-</template>
-
-<script>
-export default {
-    props: {
-        gridSize: {
-            type: Array,
-            required: true,
-            validator: (arr) => arr && arr.length === 2
-                && arr.every(el => typeof el === 'number')
-        },
-        showGrid: {
-            type: Boolean,
-            required: true
-        }
-    }
-};
-</script>
--- a/src/plugins/displayLayout/components/ImageView.vue
+++ b/src/plugins/displayLayout/components/ImageView.vue
@@ -81,7 +81,6 @@ export default {
        style() {
            let backgroundImage = 'url(' + this.item.url + ')';
            let border = '1px solid ' + this.item.stroke;
-
            if (this.itemStyle) {
                if (this.itemStyle.imageUrl !== undefined) {
                    backgroundImage = 'url(' + this.itemStyle.imageUrl + ')';
--- a/src/plugins/displayLayout/components/SubobjectView.vue
+++ b/src/plugins/displayLayout/components/SubobjectView.vue
@@ -35,8 +35,6 @@
        :object-path="currentObjectPath"
        :has-frame="item.hasFrame"
        :show-edit-view="false"
-        :layout-font-size="item.fontSize"
-        :layout-font="item.font"
    />
 </layout-frame>
 </template>
@@ -75,8 +73,6 @@ export default {
            y: position[1],
            identifier: domainObject.identifier,
            hasFrame: hasFrameByDefault(domainObject.type),
-            fontSize: 'default',
-            font: 'default',
            viewKey
        };
    },
--- a/src/plugins/displayLayout/components/TelemetryView.vue
+++ b/src/plugins/displayLayout/components/TelemetryView.vue
@@ -30,15 +30,16 @@
 >
    <div
        v-if="domainObject"
-        class="c-telemetry-view u-style-receiver"
-        :class="[statusClass]"
+        class="c-telemetry-view"
+        :class="{
+            styleClass,
+            'is-missing': domainObject.status === 'missing'
+        }"
        :style="styleObject"
-        :data-font-size="item.fontSize"
-        :data-font="item.font"
-        @contextmenu.prevent="showContextMenu"
+        @contextmenu.prevent.stop="showContextMenu"
    >
-        <div class="is-status__indicator"
-             :title="`This item is ${status}`"
+        <div class="is-missing__indicator"
+             title="This item is missing"
        ></div>
        <div
            v-if="showLabel"
@@ -71,6 +72,7 @@

 <script>
 import LayoutFrame from './LayoutFrame.vue';
+import printj from 'printj';
 import conditionalStylesMixin from "../mixins/objectStyles-mixin";
 import { getDefaultNotebook } from '@/plugins/notebook/utils/notebook-storage.js';

@@ -94,8 +96,7 @@ export default {
            stroke: "",
            fill: "",
            color: "",
-            fontSize: 'default',
-            font: 'default'
+            size: "13px"
        };
    },
    inject: ['openmct', 'objectPath'],
@@ -130,14 +131,10 @@ export default {
            datum: undefined,
            domainObject: undefined,
            formats: undefined,
-            viewKey: `alphanumeric-format-${Math.random()}`,
-            status: ''
+            viewKey: `alphanumeric-format-${Math.random()}`
        };
    },
    computed: {
-        statusClass() {
-            return (this.status) ? `is-status--${this.status}` : '';
-        },
        showLabel() {
            let displayMode = this.item.displayMode;

@@ -155,15 +152,10 @@ export default {
            return unit;
        },
        styleObject() {
-            let size;
-            //for legacy size support
-            if (!this.item.fontSize) {
-                size = this.item.size;
-            }
-
            return Object.assign({}, {
-                size
+                fontSize: this.item.size
            }, this.itemStyle);
+
        },
        fieldName() {
            return this.valueMetadata && this.valueMetadata.name;
@@ -171,11 +163,7 @@ export default {
        valueMetadata() {
            return this.datum && this.metadata.value(this.item.value);
        },
-        formatter() {
-            if (this.item.format) {
-                return this.customStringformatter;
-            }
-
+        valueFormatter() {
            return this.formats[this.item.value];
        },
        telemetryValue() {
@@ -183,7 +171,11 @@ export default {
                return;
            }

-            return this.formatter && this.formatter.format(this.datum);
+            if (this.item.format) {
+                return printj.sprintf(this.item.format, this.datum[this.valueMetadata.key]);
+            }
+
+            return this.valueFormatter && this.valueFormatter.format(this.datum);
        },
        telemetryClass() {
            if (!this.datum) {
@@ -215,13 +207,9 @@ export default {
        this.openmct.objects.get(this.item.identifier)
            .then(this.setObject);
        this.openmct.time.on("bounds", this.refreshData);
-
-        this.status = this.openmct.status.get(this.item.identifier);
-        this.removeStatusListener = this.openmct.status.observe(this.item.identifier, this.setStatus);
    },
    destroyed() {
        this.removeSubscription();
-        this.removeStatusListener();

        if (this.removeSelectable) {
            this.removeSelectable();
@@ -230,6 +218,12 @@ export default {
        this.openmct.time.off("bounds", this.refreshData);
    },
    methods: {
+        getViewContext() {
+            return {
+                getViewKey: () => this.viewKey,
+                formattedValueForCopy: this.formattedValueForCopy
+            };
+        },
        formattedValueForCopy() {
            const timeFormatterKey = this.openmct.time.timeSystem().key;
            const timeFormatter = this.formats[timeFormatterKey];
@@ -275,10 +269,10 @@ export default {
        },
        getView() {
            return {
-                getViewContext: () => {
+                getViewContext() {
                    return {
                        viewHistoricalData: true,
-                        formattedValueForCopy: this.formattedValueForCopy
+                        skipCache: true
                    };
                }
            };
@@ -289,10 +283,6 @@ export default {
            this.metadata = this.openmct.telemetry.getMetadata(this.domainObject);
            this.limitEvaluator = this.openmct.telemetry.limitEvaluator(this.domainObject);
            this.formats = this.openmct.telemetry.getFormatMap(this.metadata);
-
-            const valueMetadata = this.metadata.value(this.item.value);
-            this.customStringformatter = this.openmct.telemetry.customStringFormatter(valueMetadata, this.item.format);
-
            this.requestHistoricalData();
            this.subscribeToObject();

@@ -310,39 +300,37 @@ export default {
            this.removeSelectable = this.openmct.selection.selectable(
                this.$el, this.context, this.immediatelySelect || this.initSelect);
            delete this.immediatelySelect;
+
+            let allActions = this.openmct.actions.get(this.currentObjectPath, this.getView());
+
+            this.applicableActions = CONTEXT_MENU_ACTIONS.map(actionKey => {
+                return allActions[actionKey];
+            });
        },
        updateTelemetryFormat(format) {
-            this.customStringformatter.setFormat(format);
-
            this.$emit('formatChanged', this.item, format);
        },
        async getContextMenuActions() {
            const defaultNotebook = getDefaultNotebook();
            const domainObject = defaultNotebook && await this.openmct.objects.get(defaultNotebook.notebookMeta.identifier);
-            const actionCollection = this.openmct.actions.get(this.currentObjectPath, this.getView());
-            const actionsObject = actionCollection.getActionsObject();

-            let copyToNotebookAction = actionsObject.copyToNotebook;
+            const actionsObject = this.openmct.actions.get(this.currentObjectPath, this.getViewContext(), { viewHistoricalData: true }).applicableActions;
+            let applicableActionKeys = Object.keys(actionsObject)
+                .filter(key => {
+                    const isCopyToNotebook = actionsObject[key].key === 'copyToNotebook';
+                    if (defaultNotebook && isCopyToNotebook) {
+                        const defaultPath = domainObject && `${domainObject.name} - ${defaultNotebook.section.name} - ${defaultNotebook.page.name}`;
+                        actionsObject[key].name = `Copy to Notebook ${defaultPath}`;
+                    }

-            if (defaultNotebook) {
-                const defaultPath = domainObject && `${domainObject.name} - ${defaultNotebook.section.name} - ${defaultNotebook.page.name}`;
-                copyToNotebookAction.name = `Copy to Notebook ${defaultPath}`;
-            } else {
-                actionsObject.copyToNotebook = undefined;
-                delete actionsObject.copyToNotebook;
-            }
+                    return CONTEXT_MENU_ACTIONS.includes(actionsObject[key].key);
+                });

-            return CONTEXT_MENU_ACTIONS.map(actionKey => {
-                return actionsObject[actionKey];
-            }).filter(action => action !== undefined);
+            return applicableActionKeys.map(key => actionsObject[key]);
        },
        async showContextMenu(event) {
            const contextMenuActions = await this.getContextMenuActions();
-
            this.openmct.menus.showMenu(event.x, event.y, contextMenuActions);
-        },
-        setStatus(status) {
-            this.status = status;
        }
    }
 };
--- a/src/plugins/displayLayout/components/TextView.vue
+++ b/src/plugins/displayLayout/components/TextView.vue
@@ -29,9 +29,7 @@
    @endMove="() => $emit('endMove')"
 >
    <div
-        class="c-text-view u-style-receiver js-style-receiver"
-        :data-font-size="item.fontSize"
-        :data-font="item.font"
+        class="c-text-view"
        :class="[styleClass]"
        :style="style"
    >
@@ -49,14 +47,13 @@ export default {
        return {
            fill: '',
            stroke: '',
+            size: '13px',
            color: '',
            x: 1,
            y: 1,
            width: 10,
            height: 5,
-            text: element.text,
-            fontSize: 'default',
-            font: 'default'
+            text: element.text
        };
    },
    inject: ['openmct'],
@@ -87,14 +84,8 @@ export default {
    },
    computed: {
        style() {
-            let size;
-            //legacy size support
-            if (!this.item.fontSize) {
-                size = this.item.size;
-            }
-
            return Object.assign({
-                size
+                fontSize: this.item.size
            }, this.itemStyle);
        }
    },
--- a/src/plugins/displayLayout/components/display-layout.scss
+++ b/src/plugins/displayLayout/components/display-layout.scss
@@ -17,29 +17,10 @@
    flex-direction: column;
    overflow: auto;

-    &__grid-holder,
-    &__dimensions {
+    &__grid-holder {
        display: none;
    }

-    &__dimensions {
-        $b: 1px dashed $editDimensionsColor;
-        border-right: $b;
-        border-bottom: $b;
-        pointer-events: none;
-        position: absolute;
-
-        &-vals {
-            $p: 2px;
-            color: $editDimensionsColor;
-            display: inline-block;
-            font-style: italic;
-            position: absolute;
-            bottom: $p; right: $p;
-            opacity: 0.7;
-        }
-    }
-
    &__frame {
        position: absolute;
    }
@@ -53,10 +34,6 @@
            > .l-layout {
                background: $editUIGridColorBg;

-                > [class*="__dimensions"] {
-                    display: block;
-                }
-
                > [class*="__grid-holder"] {
                    display: block;
                }
@@ -65,16 +42,12 @@
    }

    .l-layout__frame {
-        &[s-selected]:not([multi-select="true"]),
+        &[s-selected],
        &[s-selected-parent] {
            // Display grid and allow edit marquee to display in nested layouts when editing
-            > * > * > .l-layout.allow-editing {
+            > * > * > .l-layout + .allow-editing {
                box-shadow: inset $editUIGridColorFg 0 0 2px 1px;

-                > [class*="__dimensions"] {
-                    display: block;
-                }
-
                > [class*='grid-holder'] {
                    display: block;
                }
--- a/src/plugins/displayLayout/components/telemetry-view.scss
+++ b/src/plugins/displayLayout/components/telemetry-view.scss
@@ -7,6 +7,7 @@
        flex: 1 1 auto;
        display: flex;
        flex-direction: row;
+       // justify-content: center;
        align-items: center;
        overflow: hidden;
        padding: $interiorMargin;
@@ -26,13 +27,14 @@
        border: 1px solid transparent;
    }

-    .is-status__indicator {
-        position: absolute;
+    @include isMissing($absPos: true);
+
+    .is-missing__indicator {
        top: 0;
        left: 0;
    }

-    &[class*='is-status'] {
+    &.is-missing {
        border: $borderMissing;
    }
 }
--- a/src/plugins/displayLayout/mixins/objectStyles-mixin.js
+++ b/src/plugins/displayLayout/mixins/objectStyles-mixin.js
@@ -27,7 +27,6 @@ export default {
    inject: ['openmct'],
    data() {
        return {
-            objectStyle: undefined,
            itemStyle: undefined,
            styleClass: ''
        };
--- a/src/plugins/displayLayout/plugin.js
+++ b/src/plugins/displayLayout/plugin.js
@@ -75,8 +75,7 @@ export default function DisplayLayoutPlugin(options) {
                            duplicateItem: component && component.$refs.displayLayout.duplicateItem,
                            switchViewType: component && component.$refs.displayLayout.switchViewType,
                            mergeMultipleTelemetryViews: component && component.$refs.displayLayout.mergeMultipleTelemetryViews,
-                            mergeMultipleOverlayPlots: component && component.$refs.displayLayout.mergeMultipleOverlayPlots,
-                            toggleGrid: component && component.$refs.displayLayout.toggleGrid
+                            mergeMultipleOverlayPlots: component && component.$refs.displayLayout.mergeMultipleOverlayPlots
                        };
                    },
                    onEditModeChange: function (isEditing) {
--- a/src/plugins/displayLayout/pluginSpec.js
+++ b/src/plugins/displayLayout/pluginSpec.js
@@ -340,7 +340,6 @@ describe('the plugin', function () {

        it('provides controls including separators', () => {
            const displayLayoutToolbar = openmct.toolbars.get(selection);
-
            expect(displayLayoutToolbar.length).toBe(9);
        });
    });
--- a/src/plugins/duplicate/DuplicateAction.js
+++ b/src/plugins/duplicate/DuplicateAction.js
@@ -1,159 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2020, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is 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.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-import DuplicateTask from './DuplicateTask';
-
-export default class DuplicateAction {
-    constructor(openmct) {
-        this.name = 'Duplicate';
-        this.key = 'duplicate';
-        this.description = 'Duplicate this object.';
-        this.cssClass = "icon-duplicate";
-        this.group = "action";
-        this.priority = 7;
-
-        this.openmct = openmct;
-    }
-
-    async invoke(objectPath) {
-        let duplicationTask = new DuplicateTask(this.openmct);
-        let originalObject = objectPath[0];
-        let parent = objectPath[1];
-        let userInput = await this.getUserInput(originalObject, parent);
-        let newParent = userInput.location;
-        let inNavigationPath = this.inNavigationPath(originalObject);
-
-        // legacy check
-        if (this.isLegacyDomainObject(newParent)) {
-            newParent = await this.convertFromLegacy(newParent);
-        }
-
-        // if editing, save
-        if (inNavigationPath && this.openmct.editor.isEditing()) {
-            this.openmct.editor.save();
-        }
-
-        // duplicate
-        let newObject = await duplicationTask.duplicate(originalObject, newParent);
-        this.updateNameCheck(newObject, userInput.name);
-
-        return;
-    }
-
-    async getUserInput(originalObject, parent) {
-        let dialogService = this.openmct.$injector.get('dialogService');
-        let dialogForm = this.getDialogForm(originalObject, parent);
-        let formState = {
-            name: originalObject.name
-        };
-        let userInput = await dialogService.getUserInput(dialogForm, formState);
-
-        return userInput;
-    }
-
-    updateNameCheck(object, name) {
-        if (object.name !== name) {
-            this.openmct.objects.mutate(object, 'name', name);
-        }
-    }
-
-    inNavigationPath(object) {
-        return this.openmct.router.path
-            .some(objectInPath => this.openmct.objects.areIdsEqual(objectInPath.identifier, object.identifier));
-    }
-
-    getDialogForm(object, parent) {
-        return {
-            name: "Duplicate Item",
-            sections: [
-                {
-                    rows: [
-                        {
-                            key: "name",
-                            control: "textfield",
-                            name: "Folder Name",
-                            pattern: "\\S+",
-                            required: true,
-                            cssClass: "l-input-lg"
-                        },
-                        {
-                            name: "location",
-                            cssClass: "grows",
-                            control: "locator",
-                            validate: this.validate(object, parent),
-                            key: 'location'
-                        }
-                    ]
-                }
-            ]
-        };
-    }
-
-    validate(object, currentParent) {
-        return (parentCandidate) => {
-            let currentParentKeystring = this.openmct.objects.makeKeyString(currentParent.identifier);
-            let parentCandidateKeystring = this.openmct.objects.makeKeyString(parentCandidate.getId());
-            let objectKeystring = this.openmct.objects.makeKeyString(object.identifier);
-
-            if (!parentCandidate || !currentParentKeystring) {
-                return false;
-            }
-
-            if (parentCandidateKeystring === objectKeystring) {
-                return false;
-            }
-
-            return this.openmct.composition.checkPolicy(
-                parentCandidate.useCapability('adapter'),
-                object
-            );
-        };
-    }
-
-    isLegacyDomainObject(domainObject) {
-        return domainObject.getCapability !== undefined;
-    }
-
-    async convertFromLegacy(legacyDomainObject) {
-        let objectContext = legacyDomainObject.getCapability('context');
-        let domainObject = await this.openmct.objects.get(objectContext.domainObject.id);
-
-        return domainObject;
-    }
-
-    appliesTo(objectPath) {
-        let parent = objectPath[1];
-        let parentType = parent && this.openmct.types.get(parent.type);
-        let child = objectPath[0];
-        let childType = child && this.openmct.types.get(child.type);
-        let locked = child.locked ? child.locked : parent && parent.locked;
-
-        if (locked) {
-            return false;
-        }
-
-        return childType
-            && childType.definition.creatable
-            && parentType
-            && parentType.definition.creatable
-            && Array.isArray(parent.composition);
-    }
-}
--- a/src/plugins/duplicate/DuplicateTask.js
+++ b/src/plugins/duplicate/DuplicateTask.js
@@ -1,270 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2020, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is 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.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-import uuid from 'uuid';
-
-/**
- * This class encapsulates the process of  duplicating/copying a domain object
- * and all of its children.
- *
- * @param {DomainObject} domainObject The object to duplicate
- * @param {DomainObject} parent The new location of the cloned object tree
- * @param {src/plugins/duplicate.DuplicateService~filter} filter
- *        a function used to filter out objects from
- *        the cloning process
- * @constructor
- */
-export default class DuplicateTask {
-
-    constructor(openmct) {
-        this.domainObject = undefined;
-        this.parent = undefined;
-        this.firstClone = undefined;
-        this.filter = undefined;
-        this.persisted = 0;
-        this.clones = [];
-        this.idMap = {};
-
-        this.openmct = openmct;
-    }
-
-    /**
-     * Execute the duplicate/copy task with the objects provided in the constructor.
-     * @returns {promise} Which will resolve with a clone of the object
-     * once complete.
-     */
-    async duplicate(domainObject, parent, filter) {
-        this.domainObject = domainObject;
-        this.parent = parent;
-        this.filter = filter || this.isCreatable;
-
-        await this.buildDuplicationPlan();
-        await this.persistObjects();
-        await this.addClonesToParent();
-
-        return this.firstClone;
-    }
-
-    /**
-     * Will build a graph of an object and all of its child objects in
-     * memory
-     * @private
-     * @param domainObject The original object to be copied
-     * @param parent The parent of the original object to be copied
-     * @returns {Promise} resolved with an array of clones of the models
-     * of the object tree being copied. Duplicating is done in a bottom-up
-     * fashion, so that the last member in the array is a clone of the model
-     * object being copied. The clones are all full composed with
-     * references to their own children.
-     */
-    async buildDuplicationPlan() {
-        let domainObjectClone = await this.duplicateObject(this.domainObject);
-        if (domainObjectClone !== this.domainObject) {
-            domainObjectClone.location = this.getId(this.parent);
-        }
-
-        this.firstClone = domainObjectClone;
-
-        return;
-    }
-
-    /**
-     * Will persist a list of {@link objectClones}. It will persist all
-     * simultaneously, irrespective of order in the list. This may
-     * result in automatic request batching by the browser.
-     */
-    async persistObjects() {
-        let initialCount = this.clones.length;
-        let dialog = this.openmct.overlays.progressDialog({
-            progressPerc: 0,
-            message: `Duplicating ${initialCount} files.`,
-            iconClass: 'info',
-            title: 'Duplicating'
-        });
-        let clonesDone = Promise.all(this.clones.map(clone => {
-            let percentPersisted = Math.ceil(100 * (++this.persisted / initialCount));
-            let message = `Duplicating ${initialCount - this.persisted} files.`;
-
-            dialog.updateProgress(percentPersisted, message);
-
-            return this.openmct.objects.save(clone);
-        }));
-
-        await clonesDone;
-        dialog.dismiss();
-        this.openmct.notifications.info(`Duplicated ${this.persisted} objects.`);
-
-        return;
-    }
-
-    /**
-     * Will add a list of clones to the specified parent's composition
-     */
-    async addClonesToParent() {
-        let parentComposition = this.openmct.composition.get(this.parent);
-        await parentComposition.load();
-        parentComposition.add(this.firstClone);
-
-        return;
-    }
-
-    /**
-     * A recursive function that will perform a bottom-up duplicate of
-     * the object tree with originalObject at the root. Recurses to
-     * the farthest leaf, then works its way back up again,
-     * cloning objects, and composing them with their child clones
-     * as it goes
-     * @private
-     * @returns {DomainObject} If the type of the original object allows for
-     * duplication, then a duplicate of the object, otherwise the object
-     * itself (to allow linking to non duplicatable objects).
-     */
-    async duplicateObject(originalObject) {
-        // Check if the creatable (or other passed in filter).
-        if (this.filter(originalObject)) {
-            // Clone original object
-            let clone = this.cloneObjectModel(originalObject);
-
-            // Get children, if any
-            let composeesCollection = this.openmct.composition.get(originalObject);
-            let composees;
-
-            if (composeesCollection) {
-                composees = await composeesCollection.load();
-            }
-
-            // Recursively duplicate children
-            return this.duplicateComposees(clone, composees);
-        }
-
-        // Not creatable, creating a link, no need to iterate children
-        return originalObject;
-    }
-
-    /**
-     * Update identifiers in a cloned object model (or part of
-     * a cloned object model) to reflect new identifiers after
-     * duplicating.
-     * @private
-     */
-    rewriteIdentifiers(obj, idMap) {
-        function lookupValue(value) {
-            return (typeof value === 'string' && idMap[value]) || value;
-        }
-
-        if (Array.isArray(obj)) {
-            obj.forEach((value, index) => {
-                obj[index] = lookupValue(value);
-                this.rewriteIdentifiers(obj[index], idMap);
-            });
-        } else if (obj && typeof obj === 'object') {
-            Object.keys(obj).forEach((key) => {
-                let value = obj[key];
-                obj[key] = lookupValue(value);
-                if (idMap[key]) {
-                    delete obj[key];
-                    obj[idMap[key]] = value;
-                }
-
-                this.rewriteIdentifiers(value, idMap);
-            });
-        }
-    }
-
-    /**
-     * Given an array of objects composed by a parent, clone them, then
-     * add them to the parent.
-     * @private
-     * @returns {*}
-     */
-    async duplicateComposees(clonedParent, composees = []) {
-        let idMap = {};
-
-        let allComposeesDuplicated = composees.reduce(async (previousPromise, nextComposee) => {
-            await previousPromise;
-            let clonedComposee = await this.duplicateObject(nextComposee);
-            idMap[this.getId(nextComposee)] = this.getId(clonedComposee);
-            await this.composeChild(clonedComposee, clonedParent, clonedComposee !== nextComposee);
-
-            return;
-        }, Promise.resolve());
-
-        await allComposeesDuplicated;
-
-        this.rewriteIdentifiers(clonedParent, idMap);
-        this.clones.push(clonedParent);
-
-        return clonedParent;
-    }
-
-    async composeChild(child, parent, setLocation) {
-        const PERSIST_BOOL = false;
-        let parentComposition = this.openmct.composition.get(parent);
-        await parentComposition.load();
-        parentComposition.add(child, PERSIST_BOOL);
-
-        //If a location is not specified, set it.
-        if (setLocation && child.location === undefined) {
-            let parentKeyString = this.getId(parent);
-            child.location = parentKeyString;
-        }
-    }
-
-    getTypeDefinition(domainObject, definition) {
-        let typeDefinitions = this.openmct.types.get(domainObject.type).definition;
-
-        return typeDefinitions[definition] || false;
-    }
-
-    cloneObjectModel(domainObject) {
-        let clone = JSON.parse(JSON.stringify(domainObject));
-        let identifier = {
-            key: uuid(),
-            namespace: domainObject.identifier.namespace
-        };
-
-        if (clone.modified || clone.persisted || clone.location) {
-            clone.modified = undefined;
-            clone.persisted = undefined;
-            clone.location = undefined;
-            delete clone.modified;
-            delete clone.persisted;
-            delete clone.location;
-        }
-
-        if (clone.composition) {
-            clone.composition = [];
-        }
-
-        clone.identifier = identifier;
-
-        return clone;
-    }
-
-    getId(domainObject) {
-        return this.openmct.objects.makeKeyString(domainObject.identifier);
-    }
-
-    isCreatable(domainObject) {
-        return this.getTypeDefinition(domainObject, 'creatable');
-    }
-}
--- a/src/plugins/duplicate/plugin.js
+++ b/src/plugins/duplicate/plugin.js
@@ -1,28 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2019, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is 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.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-import DuplicateAction from "./DuplicateAction";
-
-export default function () {
-    return function (openmct) {
-        openmct.actions.register(new DuplicateAction(openmct));
-    };
-}
--- a/src/plugins/duplicate/pluginSpec.js
+++ b/src/plugins/duplicate/pluginSpec.js
@@ -1,157 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2020, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is 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.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-import DuplicateActionPlugin from './plugin.js';
-import DuplicateAction from './DuplicateAction.js';
-import DuplicateTask from './DuplicateTask.js';
-import {
-    createOpenMct,
-    resetApplicationState,
-    getMockObjects
-} from 'utils/testing';
-
-describe("The Duplicate Action plugin", () => {
-
-    let openmct;
-    let duplicateTask;
-    let childObject;
-    let parentObject;
-    let anotherParentObject;
-
-    // this setups up the app
-    beforeEach((done) => {
-        openmct = createOpenMct();
-
-        childObject = getMockObjects({
-            objectKeyStrings: ['folder'],
-            overwrite: {
-                folder: {
-                    name: "Child Folder",
-                    identifier: {
-                        namespace: "",
-                        key: "child-folder-object"
-                    }
-                }
-            }
-        }).folder;
-        parentObject = getMockObjects({
-            objectKeyStrings: ['folder'],
-            overwrite: {
-                folder: {
-                    name: "Parent Folder",
-                    composition: [childObject.identifier]
-                }
-            }
-        }).folder;
-        anotherParentObject = getMockObjects({
-            objectKeyStrings: ['folder'],
-            overwrite: {
-                folder: {
-                    name: "Another Parent Folder"
-                }
-            }
-        }).folder;
-
-        let objectGet = openmct.objects.get.bind(openmct.objects);
-        spyOn(openmct.objects, 'get').and.callFake((identifier) => {
-            let obj = [childObject, parentObject, anotherParentObject].find((ob) => ob.identifier.key === identifier.key);
-
-            if (!obj) {
-                // not one of the mocked objs, callthrough basically
-                return objectGet(identifier);
-            }
-
-            return Promise.resolve(obj);
-        });
-
-        spyOn(openmct.composition, 'get').and.callFake((domainObject) => {
-            return {
-                load: async () => {
-                    let obj = [childObject, parentObject, anotherParentObject].find((ob) => ob.identifier.key === domainObject.identifier.key);
-                    let children = [];
-
-                    if (obj) {
-                        for (let i = 0; i < obj.composition.length; i++) {
-                            children.push(await openmct.objects.get(obj.composition[i]));
-                        }
-                    }
-
-                    return Promise.resolve(children);
-                },
-                add: (child) => {
-                    domainObject.composition.push(child.identifier);
-                }
-            };
-        });
-
-        // already installed by default, but never hurts, just adds to context menu
-        openmct.install(DuplicateActionPlugin());
-
-        openmct.on('start', done);
-        openmct.startHeadless();
-    });
-
-    afterEach(() => {
-        resetApplicationState(openmct);
-    });
-
-    it("should be defined", () => {
-        expect(DuplicateActionPlugin).toBeDefined();
-    });
-
-    describe("when moving an object to a new parent", () => {
-
-        beforeEach(async (done) => {
-            duplicateTask = new DuplicateTask(openmct);
-            await duplicateTask.duplicate(parentObject, anotherParentObject);
-            done();
-        });
-
-        it("the duplicate child object's name (when not changing) should be the same as the original object", async () => {
-            let duplicatedObjectIdentifier = anotherParentObject.composition[0];
-            let duplicatedObject = await openmct.objects.get(duplicatedObjectIdentifier);
-            let duplicateObjectName = duplicatedObject.name;
-
-            expect(duplicateObjectName).toEqual(parentObject.name);
-        });
-
-        it("the duplicate child object's identifier should be new", () => {
-            let duplicatedObjectIdentifier = anotherParentObject.composition[0];
-
-            expect(duplicatedObjectIdentifier.key).not.toEqual(parentObject.identifier.key);
-        });
-    });
-
-    describe("when a new name is provided for the duplicated object", () => {
-        const NEW_NAME = 'New Name';
-
-        beforeEach(() => {
-            duplicateTask = new DuplicateAction(openmct);
-            duplicateTask.updateNameCheck(parentObject, NEW_NAME);
-        });
-
-        it("the name is updated", () => {
-            let childName = parentObject.name;
-            expect(childName).toEqual(NEW_NAME);
-        });
-    });
-
-});
--- a/src/plugins/filters/components/global-filters.scss
+++ b/src/plugins/filters/components/global-filters.scss
@@ -3,26 +3,20 @@
    @include userSelectNone();
    background: $colorFilterBg;
    color: $colorFilterFg;
+    display: flex;
+    align-items: center;
+    font-size: 0.9em;
+    margin-top: $interiorMarginSm;
+    padding: 2px;
+    text-transform: uppercase;

    &:before {
        font-family: symbolsfont-12px;
        content: $glyph-icon-filter;
+        display: block;
+        font-size: 12px;
        margin-right: $interiorMarginSm;
    }
-
-    &--mixed {
-        .c-filter-indication__mixed {
-            font-style: italic;
-        }
-    }
-
-    &__label {
-        + .c-filter-indication__label {
-            &:before {
-                content: ', ';
-            }
-        }
-    }
 }

 .c-filter-tree-item {
--- a/src/plugins/folderView/components/GridItem.vue
+++ b/src/plugins/folderView/components/GridItem.vue
@@ -1,10 +1,11 @@
 <template>
 <a
    class="l-grid-view__item c-grid-item"
-    :class="[{
+    :class="{
        'is-alias': item.isAlias === true,
+        'is-missing': item.model.status === 'missing',
        'c-grid-item--unknown': item.type.cssClass === undefined || item.type.cssClass.indexOf('unknown') !== -1
-    }, statusClass]"
+    }"
    :href="objectLink"
 >
    <div
@@ -26,8 +27,8 @@
        </div>
    </div>
    <div class="c-grid-item__controls">
-        <div class="is-status__indicator"
-             :title="`This item is ${status}`"
+        <div class="is-missing__indicator"
+             title="This item is missing"
        ></div>
        <div
            class="icon-people"
@@ -45,10 +46,9 @@
 <script>
 import contextMenuGesture from '../../../ui/mixins/context-menu-gesture';
 import objectLink from '../../../ui/mixins/object-link';
-import statusListener from './status-listener';

 export default {
-    mixins: [contextMenuGesture, objectLink, statusListener],
+    mixins: [contextMenuGesture, objectLink],
    props: {
        item: {
            type: Object,
--- a/src/plugins/folderView/components/ListItem.vue
+++ b/src/plugins/folderView/components/ListItem.vue
@@ -8,15 +8,15 @@
        <a
            ref="objectLink"
            class="c-object-label"
-            :class="[statusClass]"
+            :class="{ 'is-missing': item.model.status === 'missing' }"
            :href="objectLink"
        >
            <div
                class="c-object-label__type-icon c-list-item__name__type-icon"
                :class="item.type.cssClass"
            >
-                <span class="is-status__indicator"
-                      :title="`This item is ${status}`"
+                <span class="is-missing__indicator"
+                      title="This item is missing"
                ></span>
            </div>
            <div class="c-object-label__name c-list-item__name__name">{{ item.model.name }}</div>
@@ -39,10 +39,9 @@
 import moment from 'moment';
 import contextMenuGesture from '../../../ui/mixins/context-menu-gesture';
 import objectLink from '../../../ui/mixins/object-link';
-import statusListener from './status-listener';

 export default {
-    mixins: [contextMenuGesture, objectLink, statusListener],
+    mixins: [contextMenuGesture, objectLink],
    props: {
        item: {
            type: Object,
--- a/src/plugins/folderView/components/grid-item.scss
+++ b/src/plugins/folderView/components/grid-item.scss
@@ -0,0 +1,121 @@
+/******************************* GRID ITEMS */
+.c-grid-item {
+    // Mobile-first
+    @include button($bg: $colorItemBg, $fg: $colorItemFg);
+    cursor: pointer;
+    display: flex;
+    padding: $interiorMarginLg;
+
+    &__type-icon {
+        filter: $colorKeyFilter;
+        flex: 0 0 $gridItemMobile;
+        font-size: floor($gridItemMobile / 2);
+        margin-right: $interiorMarginLg;
+    }
+
+    &.is-alias {
+        // Object is an alias to an original.
+        [class*='__type-icon'] {
+            @include isAlias();
+            color: $colorIconAliasForKeyFilter;
+        }
+    }
+
+    &__details {
+        display: flex;
+        flex-flow: column nowrap;
+        flex: 1 1 auto;
+    }
+
+    &__name {
+        @include ellipsize();
+        color: $colorItemFg;
+        @include headerFont(1.2em);
+        margin-bottom: $interiorMarginSm;
+    }
+
+    &__metadata {
+        color: $colorItemFgDetails;
+        font-size: 0.9em;
+
+        body.mobile & {
+            [class*='__item-count'] {
+                &:before {
+                    content: ' - ';
+                }
+            }
+        }
+    }
+
+    &__controls {
+        color: $colorItemFgDetails;
+        flex: 0 0 64px;
+        font-size: 1.2em;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+
+        > * + * {
+            margin-left: $interiorMargin;
+        }
+    }
+
+    body.desktop & {
+        $transOutMs: 300ms;
+        flex-flow: column nowrap;
+        transition: background $transOutMs ease-in-out;
+
+        &:hover {
+            background: $colorItemBgHov;
+            transition: $transIn;
+
+            .c-grid-item__type-icon {
+                filter: $colorKeyFilterHov;
+                transform: scale(1);
+                transition: $transInBounce;
+            }
+        }
+
+        > * {
+            margin: 0; // Reset from mobile
+        }
+
+        &__controls {
+            align-items: start;
+            flex: 0 0 auto;
+            order: 1;
+            .c-info-button,
+            .c-pointer-icon { display: none; }
+        }
+
+        &__type-icon {
+            flex: 1 1 auto;
+            font-size: floor($gridItemDesk / 3);
+            margin: $interiorMargin 22.5% $interiorMargin * 3 22.5%;
+            order: 2;
+            transform: scale(0.9);
+            transform-origin: center;
+            transition: all $transOutMs ease-in-out;
+        }
+
+        &__details {
+            flex: 0 0 auto;
+            justify-content: flex-end;
+            order: 3;
+        }
+
+        &__metadata {
+            display: flex;
+
+            &__type {
+                flex: 1 1 auto;
+                @include ellipsize();
+            }
+
+            &__item-count {
+                opacity: 0.7;
+                flex: 0 0 auto;
+            }
+        }
+    }
+}
--- a/src/plugins/folderView/components/grid-view.scss
+++ b/src/plugins/folderView/components/grid-view.scss
@@ -11,8 +11,6 @@

    body.desktop & {
        flex-flow: row wrap;
-        align-content: flex-start;
-
        &__item {
            height: $gridItemDesk;
            width: $gridItemDesk;
@@ -43,20 +41,9 @@
        }
    }

-    &.is-status--notebook-default {
-        .is-status__indicator {
-            display: block;
+    &.is-missing {
+        @include isMissing();

-            &:before {
-                color: $colorFilter;
-                content: $glyph-icon-notebook-page;
-                font-family: symbolsfont;
-            }
-        }
-    }
-
-    &[class*='is-status--missing'],
-    &[class*='is-status--suspect']{
        [class*='__type-icon'],
        [class*='__details'] {
            opacity: $opacityMissing;
--- a/src/plugins/folderView/components/status-listener.js
+++ b/src/plugins/folderView/components/status-listener.js
@@ -1,33 +0,0 @@
-export default {
-    inject: ['openmct'],
-    props: {
-        item: {
-            type: Object,
-            required: true
-        }
-    },
-    computed: {
-        statusClass() {
-            return (this.status) ? `is-status--${this.status}` : '';
-        }
-    },
-    data() {
-        return {
-            status: ''
-        };
-    },
-    methods: {
-        setStatus(status) {
-            this.status = status;
-        }
-    },
-    mounted() {
-        let identifier = this.item.model.identifier;
-
-        this.status = this.openmct.status.get(identifier);
-        this.removeStatusListener = this.openmct.status.observe(identifier, this.setStatus);
-    },
-    destroyed() {
-        this.removeStatusListener();
-    }
-};
--- a/src/plugins/imagery/components/ImageryViewLayout.vue
+++ b/src/plugins/imagery/components/ImageryViewLayout.vue
@@ -7,67 +7,58 @@
    @mouseover="focusElement"
 >
    <div class="c-imagery__main-image-wrapper has-local-controls">
-        <div class="h-local-controls h-local-controls--overlay-content c-local-controls--show-on-hover c-image-controls__controls">
-            <span class="c-image-controls__sliders"
-                  draggable="true"
-                  @dragstart="startDrag"
-            >
-                <div class="c-image-controls__slider-wrapper icon-brightness">
-                    <input v-model="filters.brightness"
-                           type="range"
-                           min="0"
-                           max="500"
-                    >
-                </div>
-                <div class="c-image-controls__slider-wrapper icon-contrast">
-                    <input v-model="filters.contrast"
-                           type="range"
-                           min="0"
-                           max="500"
-                    >
-                </div>
+        <div class="h-local-controls h-local-controls--overlay-content c-local-controls--show-on-hover l-flex-row c-imagery__lc">
+            <span class="holder flex-elem grows c-imagery__lc__sliders">
+                <input v-model="filters.brightness"
+                       class="icon-brightness"
+                       type="range"
+                       min="0"
+                       max="500"
+                >
+                <input v-model="filters.contrast"
+                       class="icon-contrast"
+                       type="range"
+                       min="0"
+                       max="500"
+                >
            </span>
-            <span class="t-reset-btn-holder c-imagery__lc__reset-btn c-image-controls__btn-reset">
+            <span class="holder flex-elem t-reset-btn-holder c-imagery__lc__reset-btn">
                <a class="s-icon-button icon-reset t-btn-reset"
                   @click="filters={brightness: 100, contrast: 100}"
                ></a>
            </span>
        </div>
-        <div class="c-imagery__main-image__bg"
+        <div class="main-image s-image-main c-imagery__main-image has-local-controls"
             :class="{'paused unnsynced': isPaused,'stale':false }"
+             :style="{'background-image': imageUrl ? `url(${imageUrl})` : 'none',
+                      'filter': `brightness(${filters.brightness}%) contrast(${filters.contrast}%)`}"
+             :data-openmct-image-timestamp="time"
+             :data-openmct-object-keystring="keyString"
        >
-            <div class="c-imagery__main-image__image"
-                 :style="{
-                     'background-image': imageUrl ? `url(${imageUrl})` : 'none',
-                     'filter': `brightness(${filters.brightness}%) contrast(${filters.contrast}%)`
-                 }"
-                 :data-openmct-image-timestamp="time"
-                 :data-openmct-object-keystring="keyString"
-            ></div>
-        </div>
-        <div class="c-local-controls c-local-controls--show-on-hover c-imagery__prev-next-buttons">
-            <button class="c-nav c-nav--prev"
-                    title="Previous image"
-                    :disabled="isPrevDisabled"
-                    @click="prevImage()"
-            ></button>
-            <button class="c-nav c-nav--next"
-                    title="Next image"
-                    :disabled="isNextDisabled"
-                    @click="nextImage()"
-            ></button>
+            <div class="c-local-controls c-local-controls--show-on-hover c-imagery__prev-next-buttons">
+                <button class="c-nav c-nav--prev"
+                        title="Previous image"
+                        :disabled="isPrevDisabled"
+                        @click="prevImage()"
+                ></button>
+                <button class="c-nav c-nav--next"
+                        title="Next image"
+                        :disabled="isNextDisabled"
+                        @click="nextImage()"
+                ></button>
+            </div>
        </div>

        <div class="c-imagery__control-bar">
            <div class="c-imagery__time">
-                <div class="c-imagery__timestamp u-style-receiver js-style-receiver">{{ time }}</div>
+                <div class="c-imagery__timestamp">{{ time }}</div>
                <div
                    v-if="canTrackDuration"
                    :class="{'c-imagery--new': isImageNew && !refreshCSS}"
                    class="c-imagery__age icon-timer"
                >{{ formattedDuration }}</div>
            </div>
-            <div class="h-local-controls">
+            <div class="h-local-controls flex-elem">
                <button
                    class="c-button icon-pause pause-play"
                    :class="{'is-paused': isPaused}"
@@ -455,10 +446,6 @@ export default {
                this.setFocusedImage(--index, THUMBNAIL_CLICKED);
            }
        },
-        startDrag(e) {
-            e.preventDefault();
-            e.stopPropagation();
-        },
        arrowDownHandler(event) {
            let key = event.keyCode;

--- a/src/plugins/imagery/components/imagery-view-layout.scss
+++ b/src/plugins/imagery/components/imagery-view-layout.scss
@@ -1,8 +1,8 @@
 .c-imagery {
    display: flex;
    flex-direction: column;
-    flex: 1 1 auto;
    overflow: hidden;
+    height: 100%;

    &:focus {
        outline: none;
@@ -19,21 +19,13 @@
    }

    &__main-image {
-        &__bg {
-            background-color: $colorPlotBg;
-            border: 1px solid transparent;
-            flex: 1 1 auto;
+        background-position: center;
+        background-repeat: no-repeat;
+        background-size: contain;
+        height: 100%;

-            &.unnsynced{
-                @include sUnsynced();
-            }
-        }
-
-        &__image {
-            @include abs(); // Safari fix
-            background-position: center;
-            background-repeat: no-repeat;
-            background-size: contain;
+        &.unnsynced{
+            @include sUnsynced();
        }
    }

@@ -146,6 +138,11 @@
    }
 }

+.s-image-main {
+    background-color: $colorPlotBg;
+    border: 1px solid transparent;
+}
+
 /*************************************** IMAGERY LOCAL CONTROLS*/
 .c-imagery {
    .h-local-controls--overlay-content {
@@ -155,7 +152,7 @@
        background: $colorLocalControlOvrBg;
        border-radius: $basicCr;
        max-width: 200px;
-        min-width: 70px;
+        min-width: 100px;
        width: 35%;
        align-items: center;
        padding: $interiorMargin $interiorMarginLg;
@@ -176,7 +173,6 @@
    &__lc {
        &__reset-btn {
            $bc: $scrollbarTrackColorBg;
-
            &:before,
            &:after {
                border-right: 1px solid $bc;
@@ -199,46 +195,6 @@
    }
 }

-.c-image-controls {
-    // Brightness/contrast
-
-    &__controls {
-        // Sliders and reset element
-        display: flex;
-        align-items: center;
-        margin-right: $interiorMargin; // Need some extra space due to proximity to close button
-    }
-
-    &__sliders {
-        display: flex;
-        flex: 1 1 auto;
-        flex-direction: column;
-
-        > * + * {
-            margin-top: 11px;
-        }
-    }
-
-    &__slider-wrapper {
-        // A wrapper is needed to add the type icon to left of each range input
-        display: flex;
-        align-items: center;
-
-        &:before {
-            color: rgba($colorMenuFg, 0.5);
-            margin-right: $interiorMarginSm;
-        }
-
-        input[type='range'] {
-            width: 100px;
-        }
-    }
-
-    &__btn-reset {
-        flex: 0 0 auto;
-    }
-}
-
 /*************************************** BUTTONS */
 .c-button.pause-play {
    // Pause icon set by default in markup
@@ -255,13 +211,14 @@
 }

 .c-imagery__prev-next-buttons {
+    //background: rgba(deeppink, 0.2);
    display: flex;
    width: 100%;
    justify-content: space-between;
    pointer-events: none;
    position: absolute;
    top: 50%;
-    transform: translateY(-75%);
+    transform: translateY(-50%);

    .c-nav {
        pointer-events: all;
--- a/src/plugins/interceptors/plugin.js
+++ b/src/plugins/interceptors/plugin.js
@@ -1,9 +0,0 @@
-import missingObjectInterceptor from "./missingObjectInterceptor";
-import myItemsInterceptor from "./myItemsInterceptor";
-
-export default function plugin() {
-    return function install(openmct) {
-        myItemsInterceptor(openmct);
-        missingObjectInterceptor(openmct);
-    };
-}
--- a/src/plugins/move/MoveAction.js
+++ b/src/plugins/move/MoveAction.js
@@ -1,169 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2020, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is 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.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-export default class MoveAction {
-    constructor(openmct) {
-        this.name = 'Move';
-        this.key = 'move';
-        this.description = 'Move this object from its containing object to another object.';
-        this.cssClass = "icon-move";
-        this.group = "action";
-        this.priority = 7;
-
-        this.openmct = openmct;
-    }
-
-    async invoke(objectPath) {
-        let object = objectPath[0];
-        let inNavigationPath = this.inNavigationPath(object);
-        let oldParent = objectPath[1];
-        let dialogService = this.openmct.$injector.get('dialogService');
-        let dialogForm = this.getDialogForm(object, oldParent);
-        let userInput = await dialogService.getUserInput(dialogForm, { name: object.name });
-
-        // if we need to update name
-        if (object.name !== userInput.name) {
-            this.openmct.objects.mutate(object, 'name', userInput.name);
-        }
-
-        let parentContext = userInput.location.getCapability('context');
-        let newParent = await this.openmct.objects.get(parentContext.domainObject.id);
-
-        if (inNavigationPath && this.openmct.editor.isEditing()) {
-            this.openmct.editor.save();
-        }
-
-        this.addToNewParent(object, newParent);
-        this.removeFromOldParent(oldParent, object);
-
-        if (inNavigationPath) {
-            let newObjectPath = await this.openmct.objects.getOriginalPath(object.identifier);
-            let root = await this.openmct.objects.getRoot();
-            let rootChildCount = root.composition.length;
-
-            // if not multiple root children, remove root from path
-            if (rootChildCount < 2) {
-                newObjectPath.pop(); // remove ROOT
-            }
-
-            this.navigateTo(newObjectPath);
-        }
-    }
-
-    inNavigationPath(object) {
-        return this.openmct.router.path
-            .some(objectInPath => this.openmct.objects.areIdsEqual(objectInPath.identifier, object.identifier));
-    }
-
-    navigateTo(objectPath) {
-        let urlPath = objectPath.reverse()
-            .map(object => this.openmct.objects.makeKeyString(object.identifier))
-            .join("/");
-
-        window.location.href = '#/browse/' + urlPath;
-    }
-
-    addToNewParent(child, newParent) {
-        let newParentKeyString = this.openmct.objects.makeKeyString(newParent.identifier);
-        let compositionCollection = this.openmct.composition.get(newParent);
-
-        this.openmct.objects.mutate(child, 'location', newParentKeyString);
-        compositionCollection.add(child);
-    }
-
-    removeFromOldParent(parent, child) {
-        let compositionCollection = this.openmct.composition.get(parent);
-
-        compositionCollection.remove(child);
-    }
-
-    getDialogForm(object, parent) {
-        return {
-            name: "Move Item",
-            sections: [
-                {
-                    rows: [
-                        {
-                            key: "name",
-                            control: "textfield",
-                            name: "Folder Name",
-                            pattern: "\\S+",
-                            required: true,
-                            cssClass: "l-input-lg"
-                        },
-                        {
-                            name: "location",
-                            control: "locator",
-                            validate: this.validate(object, parent),
-                            key: 'location'
-                        }
-                    ]
-                }
-            ]
-        };
-    }
-
-    validate(object, currentParent) {
-        return (parentCandidate) => {
-            let currentParentKeystring = this.openmct.objects.makeKeyString(currentParent.identifier);
-            let parentCandidateKeystring = this.openmct.objects.makeKeyString(parentCandidate.getId());
-            let objectKeystring = this.openmct.objects.makeKeyString(object.identifier);
-
-            if (!parentCandidateKeystring || !currentParentKeystring) {
-                return false;
-            }
-
-            if (parentCandidateKeystring === currentParentKeystring) {
-                return false;
-            }
-
-            if (parentCandidateKeystring === objectKeystring) {
-                return false;
-            }
-
-            if (parentCandidate.getModel().composition.indexOf(objectKeystring) !== -1) {
-                return false;
-            }
-
-            return this.openmct.composition.checkPolicy(
-                parentCandidate.useCapability('adapter'),
-                object
-            );
-        };
-    }
-
-    appliesTo(objectPath) {
-        let parent = objectPath[1];
-        let parentType = parent && this.openmct.types.get(parent.type);
-        let child = objectPath[0];
-        let childType = child && this.openmct.types.get(child.type);
-
-        if (child.locked || (parent && parent.locked)) {
-            return false;
-        }
-
-        return parentType
-            && parentType.definition.creatable
-            && childType
-            && childType.definition.creatable
-            && Array.isArray(parent.composition);
-    }
-}
--- a/src/plugins/move/plugin.js
+++ b/src/plugins/move/plugin.js
@@ -1,28 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2020, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is 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.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-import MoveAction from "./MoveAction";
-
-export default function () {
-    return function (openmct) {
-        openmct.actions.register(new MoveAction(openmct));
-    };
-}
--- a/src/plugins/move/pluginSpec.js
+++ b/src/plugins/move/pluginSpec.js
@@ -1,110 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2020, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is 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.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-import MoveActionPlugin from './plugin.js';
-import MoveAction from './MoveAction.js';
-import {
-    createOpenMct,
-    resetApplicationState,
-    getMockObjects
-} from 'utils/testing';
-
-describe("The Move Action plugin", () => {
-
-    let openmct;
-    let moveAction;
-    let childObject;
-    let parentObject;
-    let anotherParentObject;
-
-    // this setups up the app
-    beforeEach((done) => {
-        const appHolder = document.createElement('div');
-        appHolder.style.width = '640px';
-        appHolder.style.height = '480px';
-
-        openmct = createOpenMct();
-
-        childObject = getMockObjects({
-            objectKeyStrings: ['folder'],
-            overwrite: {
-                folder: {
-                    name: "Child Folder",
-                    identifier: {
-                        namespace: "",
-                        key: "child-folder-object"
-                    }
-                }
-            }
-        }).folder;
-        parentObject = getMockObjects({
-            objectKeyStrings: ['folder'],
-            overwrite: {
-                folder: {
-                    name: "Parent Folder",
-                    composition: [childObject.identifier]
-                }
-            }
-        }).folder;
-        anotherParentObject = getMockObjects({
-            objectKeyStrings: ['folder'],
-            overwrite: {
-                folder: {
-                    name: "Another Parent Folder"
-                }
-            }
-        }).folder;
-
-        // already installed by default, but never hurts, just adds to context menu
-        openmct.install(MoveActionPlugin());
-
-        openmct.on('start', done);
-        openmct.startHeadless(appHolder);
-    });
-
-    afterEach(() => {
-        resetApplicationState(openmct);
-    });
-
-    it("should be defined", () => {
-        expect(MoveActionPlugin).toBeDefined();
-    });
-
-    describe("when moving an object to a new parent and removing from the old parent", () => {
-
-        beforeEach(() => {
-            moveAction = new MoveAction(openmct);
-            moveAction.addToNewParent(childObject, anotherParentObject);
-            moveAction.removeFromOldParent(parentObject, childObject);
-        });
-
-        it("the child object's identifier should be in the new parent's composition", () => {
-            let newParentChild = anotherParentObject.composition[0];
-            expect(newParentChild).toEqual(childObject.identifier);
-        });
-
-        it("the child object's identifier should be removed from the old parent's composition", () => {
-            let oldParentComposition = parentObject.composition;
-            expect(oldParentComposition.length).toEqual(0);
-        });
-    });
-
-});
--- a/src/plugins/notebook/actions/CopyToNotebookAction.js
+++ b/src/plugins/notebook/actions/CopyToNotebookAction.js
@@ -6,11 +6,11 @@ export default class CopyToNotebookAction {
        this.openmct = openmct;

        this.cssClass = 'icon-duplicate';
-        this.description = 'Copy value to notebook as an entry';
+        this.description = 'Copy to Notebook action';
        this.group = "action";
        this.key = 'copyToNotebook';
        this.name = 'Copy to Notebook';
-        this.priority = 1;
+        this.priority = 9;
    }

    copyToNotebook(entryText) {
@@ -25,16 +25,15 @@ export default class CopyToNotebookAction {
            });
    }

-    invoke(objectPath, view = {}) {
-        let viewContext = view.getViewContext && view.getViewContext();
-
+    invoke(objectPath, viewContext) {
        this.copyToNotebook(viewContext.formattedValueForCopy());
    }

-    appliesTo(objectPath, view = {}) {
-        let viewContext = view.getViewContext && view.getViewContext();
+    appliesTo(objectPath, viewContext) {
+        if (viewContext && viewContext.getViewKey) {
+            return viewContext.getViewKey().includes('alphanumeric-format');
+        }

-        return viewContext && viewContext.formattedValueForCopy
-            && typeof viewContext.formattedValueForCopy === 'function';
+        return false;
    }
 }
--- a/src/plugins/notebook/components/Notebook.vue
+++ b/src/plugins/notebook/components/Notebook.vue
@@ -24,12 +24,12 @@
                 :default-section-id="defaultSectionId"
                 :domain-object="internalDomainObject"
                 :page-title="internalDomainObject.configuration.pageTitle"
+                 :pages="pages"
                 :section-title="internalDomainObject.configuration.sectionTitle"
                 :sections="sections"
-                 :selected-section="selectedSection"
                 :sidebar-covers-entries="sidebarCoversEntries"
-                 @pagesChanged="pagesChanged"
-                 @sectionsChanged="sectionsChanged"
+                 @updatePage="updatePage"
+                 @updateSection="updateSection"
                 @toggleNav="toggleNav"
        />
        <div class="c-notebook__page-view">
@@ -111,9 +111,7 @@ import Search from '@/ui/components/search.vue';
 import SearchResults from './SearchResults.vue';
 import Sidebar from './Sidebar.vue';
 import { clearDefaultNotebook, getDefaultNotebook, setDefaultNotebook, setDefaultNotebookSection, setDefaultNotebookPage } from '../utils/notebook-storage';
-import { addNotebookEntry, createNewEmbed, getNotebookEntries, mutateObject } from '../utils/notebook-entries';
-import objectUtils from 'objectUtils';
-
+import { DEFAULT_CLASS, addNotebookEntry, createNewEmbed, getNotebookEntries } from '../utils/notebook-entries';
 import { throttle } from 'lodash';

 export default {
@@ -220,7 +218,7 @@ export default {
                return s;
            });

-            this.sectionsChanged({ sections });
+            this.updateSection({ sections });
            this.throttledSearchItem('');
        },
        createNotebookStorageObject() {
@@ -309,7 +307,7 @@ export default {
                return null;
            }

-            return this.openmct.objects.get(oldNotebookStorage.notebookMeta.identifier);
+            return this.openmct.objects.get(oldNotebookStorage.notebookMeta.identifier).then(d => d);
        },
        getPage(section, id) {
            return section.pages.find(p => p.id === id);
@@ -379,6 +377,9 @@ export default {

            return this.sections.find(section => section.isSelected);
        },
+        mutateObject(key, value) {
+            this.openmct.objects.mutate(this.internalDomainObject, key, value);
+        },
        navigateToSectionPage() {
            const { pageId, sectionId } = this.openmct.router.getParams();
            if (!pageId || !sectionId) {
@@ -395,7 +396,7 @@ export default {
                return s;
            });

-            this.sectionsChanged({ sections });
+            this.updateSection({ sections });
        },
        newEntry(embed = null) {
            this.search = '';
@@ -408,30 +409,19 @@ export default {
        orientationChange() {
            this.formatSidebar();
        },
-        pagesChanged({ pages = [], id = null}) {
-            const selectedSection = this.getSelectedSection();
-            if (!selectedSection) {
-                return;
-            }
-
-            selectedSection.pages = pages;
-            const sections = this.sections.map(section => {
-                if (section.id === selectedSection.id) {
-                    section = selectedSection;
-                }
-
-                return section;
-            });
-
-            this.sectionsChanged({ sections });
-            this.updateDefaultNotebookPage(pages, id);
-        },
        removeDefaultClass(domainObject) {
            if (!domainObject) {
                return;
            }

-            this.openmct.status.delete(domainObject.identifier);
+            const classList = domainObject.classList || [];
+            const index = classList.indexOf(DEFAULT_CLASS);
+            if (!classList.length || index < 0) {
+                return;
+            }
+
+            classList.splice(index, 1);
+            this.openmct.objects.mutate(domainObject, 'classList', classList);
        },
        searchItem(input) {
            this.search = input;
@@ -441,21 +431,17 @@ export default {
        },
        async updateDefaultNotebook(notebookStorage) {
            const defaultNotebookObject = await this.getDefaultNotebookObject();
-            if (!defaultNotebookObject) {
-                setDefaultNotebook(this.openmct, notebookStorage);
-            } else if (objectUtils.makeKeyString(defaultNotebookObject.identifier) !== objectUtils.makeKeyString(notebookStorage.notebookMeta.identifier)) {
+            if (defaultNotebookObject.identifier.key !== notebookStorage.notebookMeta.identifier.key) {
                this.removeDefaultClass(defaultNotebookObject);
                setDefaultNotebook(this.openmct, notebookStorage);
            }

-            if (this.defaultSectionId && this.defaultSectionId.length === 0 || this.defaultSectionId !== notebookStorage.section.id) {
+            if (this.defaultSectionId.length === 0 || this.defaultSectionId !== notebookStorage.section.id) {
                this.defaultSectionId = notebookStorage.section.id;
-                setDefaultNotebookSection(notebookStorage.section);
            }

-            if (this.defaultPageId && this.defaultPageId.length === 0 || this.defaultPageId !== notebookStorage.page.id) {
+            if (this.defaultPageId.length === 0 || this.defaultPageId !== notebookStorage.page.id) {
                this.defaultPageId = notebookStorage.page.id;
-                setDefaultNotebookPage(notebookStorage.page);
            }
        },
        updateDefaultNotebookPage(pages, id) {
@@ -519,11 +505,29 @@ export default {
            const notebookEntries = configuration.entries || {};
            notebookEntries[this.selectedSection.id][this.selectedPage.id] = entries;

-            mutateObject(this.openmct, this.internalDomainObject, 'configuration.entries', notebookEntries);
+            this.mutateObject('configuration.entries', notebookEntries);
        },
        updateInternalDomainObject(domainObject) {
            this.internalDomainObject = domainObject;
        },
+        updatePage({ pages = [], id = null}) {
+            const selectedSection = this.getSelectedSection();
+            if (!selectedSection) {
+                return;
+            }
+
+            selectedSection.pages = pages;
+            const sections = this.sections.map(section => {
+                if (section.id === selectedSection.id) {
+                    section = selectedSection;
+                }
+
+                return section;
+            });
+
+            this.updateSection({ sections });
+            this.updateDefaultNotebookPage(pages, id);
+        },
        updateParams(sections) {
            const selectedSection = sections.find(s => s.isSelected);
            if (!selectedSection) {
@@ -547,8 +551,8 @@ export default {
                pageId
            });
        },
-        sectionsChanged({ sections, id = null }) {
-            mutateObject(this.openmct, this.internalDomainObject, 'configuration.sections', sections);
+        updateSection({ sections, id = null }) {
+            this.mutateObject('configuration.sections', sections);

            this.updateParams(sections);
            this.updateDefaultNotebookSection(sections, id);
--- a/src/plugins/notebook/components/NotebookEmbed.vue
+++ b/src/plugins/notebook/components/NotebookEmbed.vue
@@ -118,7 +118,7 @@ export default {
            painterroInstance.show(this.embed.snapshot.src);
        },
        changeLocation() {
-            const hash = this.embed.historicLink;
+            const link = this.embed.historicLink;

            const bounds = this.openmct.time.bounds();
            const isTimeBoundChanged = this.embed.bounds.start !== bounds.start
@@ -143,9 +143,7 @@ export default {
                this.openmct.notifications.alert(message);
            }

-            const link = `${location.host}${location.pathname}${hash}`;
-            const url = new URL(link);
-            window.location.href = url.hash;
+            window.location.href = link;
        },
        formatTime(unixTime, timeFormat) {
            return Moment.utc(unixTime).format(timeFormat);
--- a/src/plugins/notebook/components/NotebookEntry.vue
+++ b/src/plugins/notebook/components/NotebookEntry.vue
@@ -12,11 +12,12 @@
        <div class="c-ne__content">
            <div :id="entry.id"
                 class="c-ne__text"
-                 :class="{'c-ne__input' : !readOnly }"
+                 :class="{'c-input-inline' : !readOnly }"
                 :contenteditable="!readOnly"
+                 :style="!entry.text.length ? defaultEntryStyle : ''"
                 @blur="updateEntryValue($event, entry.id)"
                 @focus="updateCurrentEntryValue($event, entry.id)"
-            >{{ entry.text }}</div>
+            >{{ entry.text.length ? entry.text : defaultText }}</div>
            <div class="c-snapshots c-ne__embeds">
                <NotebookEmbed v-for="embed in entry.embeds"
                               :key="embed.id"
@@ -105,7 +106,12 @@ export default {
    },
    data() {
        return {
-            currentEntryValue: ''
+            currentEntryValue: '',
+            defaultEntryStyle: {
+                fontStyle: 'italic',
+                color: '#6e6e6e'
+            },
+            defaultText: 'add description'
        };
    },
    computed: {
@@ -229,13 +235,24 @@ export default {
            this.entry.embeds.splice(embedPosition, 1);
            this.updateEntry(this.entry);
        },
+        selectTextInsideElement(element) {
+            const range = document.createRange();
+            range.selectNodeContents(element);
+            let selection = window.getSelection();
+            selection.removeAllRanges();
+            selection.addRange(range);
+        },
        updateCurrentEntryValue($event) {
            if (this.readOnly) {
                return;
            }

            const target = $event.target;
-            this.currentEntryValue = target ? target.textContent : '';
+            this.currentEntryValue = target ? target.innerText : '';
+
+            if (!this.entry.text.length) {
+                this.selectTextInsideElement(target);
+            }
        },
        updateEmbed(newEmbed) {
            this.entry.embeds.some(e => {
@@ -275,8 +292,6 @@ export default {
            const entryPos = this.entryPosById(entryId);
            const value = target.textContent.trim();
            if (this.currentEntryValue !== value) {
-                target.textContent = value;
-
                const entries = getNotebookEntries(this.domainObject, this.selectedSection, this.selectedPage);
                entries[entryPos].text = value;

--- a/src/plugins/notebook/components/NotebookMenuSwitcher.vue
+++ b/src/plugins/notebook/components/NotebookMenuSwitcher.vue
@@ -17,7 +17,7 @@

 <script>
 import Snapshot from '../snapshot';
-import { getDefaultNotebook, validateNotebookStorageObject } from '../utils/notebook-storage';
+import { getDefaultNotebook } from '../utils/notebook-storage';
 import { NOTEBOOK_DEFAULT, NOTEBOOK_SNAPSHOT } from '../notebook-constants';

 export default {
@@ -49,10 +49,7 @@ export default {
        };
    },
    mounted() {
-        validateNotebookStorageObject();
-
        this.notebookSnapshot = new Snapshot(this.openmct);
-        this.setDefaultNotebookStatus();
    },
    methods: {
        showMenu(event) {
@@ -88,14 +85,14 @@ export default {

            this.openmct.menus.showMenu(x, y, notebookTypes);
        },
-        snapshot(notebookType) {
+        snapshot(notebook) {
            this.$nextTick(() => {
                const element = document.querySelector('.c-overlay__contents')
                    || document.getElementsByClassName('l-shell__main-container')[0];

                const bounds = this.openmct.time.bounds();
                const link = !this.ignoreLink
-                    ? window.location.hash
+                    ? window.location.href
                    : null;

                const objectPath = this.objectPath || this.openmct.router.path;
@@ -106,17 +103,8 @@ export default {
                    openmct: this.openmct
                };

-                this.notebookSnapshot.capture(snapshotMeta, notebookType, element);
+                this.notebookSnapshot.capture(snapshotMeta, notebook.type, element);
            });
-        },
-        setDefaultNotebookStatus() {
-            let defaultNotebookObject = getDefaultNotebook();
-
-            if (defaultNotebookObject && defaultNotebookObject.notebookMeta) {
-                let notebookIdentifier = defaultNotebookObject.notebookMeta.identifier;
-
-                this.openmct.status.set(notebookIdentifier, 'notebook-default');
-            }
        }
    }
 };
--- a/src/plugins/notebook/components/PageCollection.vue
+++ b/src/plugins/notebook/components/PageCollection.vue
@@ -66,10 +66,14 @@ export default {
            }
        }
    },
+    data() {
+        return {
+        };
+    },
    methods: {
        deletePage(id) {
            const selectedSection = this.sections.find(s => s.isSelected);
-            const page = this.pages.find(p => p.id !== id);
+            const page = this.pages.filter(p => p.id !== id);
            deleteNotebookEntries(this.openmct, this.domainObject, selectedSection, page);

            const selectedPage = this.pages.find(p => p.isSelected);
--- a/src/plugins/notebook/components/SectionCollection.vue
+++ b/src/plugins/notebook/components/SectionCollection.vue
@@ -53,6 +53,10 @@ export default {
            }
        }
    },
+    data() {
+        return {
+        };
+    },
    methods: {
        deleteSection(id) {
            const section = this.sections.find(s => s.id === id);
--- a/src/plugins/notebook/components/Sidebar.vue
+++ b/src/plugins/notebook/components/Sidebar.vue
@@ -18,7 +18,7 @@
                               :domain-object="domainObject"
                               :sections="sections"
                               :section-title="sectionTitle"
-                               @updateSection="sectionsChanged"
+                               @updateSection="updateSection"
            />
        </div>
    </div>
@@ -48,7 +48,7 @@
                            :sidebar-covers-entries="sidebarCoversEntries"
                            :page-title="pageTitle"
                            @toggleNav="toggleNav"
-                            @updatePage="pagesChanged"
+                            @updatePage="updatePage"
            />
        </div>
    </div>
@@ -85,6 +85,13 @@ export default {
                return {};
            }
        },
+        pages: {
+            type: Array,
+            required: true,
+            default() {
+                return [];
+            }
+        },
        pageTitle: {
            type: String,
            default() {
@@ -115,16 +122,9 @@ export default {
        return {
        };
    },
-    computed: {
-        pages() {
-            const selectedSection = this.sections.find(section => section.isSelected);
-
-            return selectedSection && selectedSection.pages || [];
-        }
-    },
    watch: {
-        pages(newPages) {
-            if (!newPages.length) {
+        pages(newpages) {
+            if (!newpages.length) {
                this.addPage();
            }
        },
@@ -141,79 +141,55 @@ export default {
    },
    methods: {
        addPage() {
-            const newPage = this.createNewPage();
-            const pages = this.addNewPage(newPage);
-
-            this.pagesChanged({
-                pages,
-                id: newPage.id
-            });
-        },
-        addSection() {
-            const newSection = this.createNewSection();
-            const sections = this.addNewSection(newSection);
-
-            this.sectionsChanged({
-                sections,
-                id: newSection.id
-            });
-        },
-        addNewPage(page) {
-            const pages = this.pages.map(p => {
-                p.isSelected = false;
-
-                return p;
-            });
-
-            return pages.concat(page);
-        },
-        addNewSection(section) {
-            const sections = this.sections.map(s => {
-                s.isSelected = false;
-
-                return s;
-            });
-
-            return sections.concat(section);
-        },
-        createNewPage() {
            const pageTitle = this.pageTitle;
            const id = uuid();
-
-            return {
+            const page = {
                id,
                isDefault: false,
                isSelected: true,
                name: `Unnamed ${pageTitle}`,
                pageTitle
            };
-        },
-        createNewSection() {
-            const sectionTitle = this.sectionTitle;
-            const id = uuid();
-            const page = this.createNewPage();
-            const pages = [page];

-            return {
-                id,
-                isDefault: false,
-                isSelected: true,
-                name: `Unnamed ${sectionTitle}`,
-                pages,
-                sectionTitle
-            };
-        },
-        toggleNav() {
-            this.$emit('toggleNav');
-        },
-        pagesChanged({ pages, id }) {
-            this.$emit('pagesChanged', {
+            this.pages.forEach(p => p.isSelected = false);
+            const pages = this.pages.concat(page);
+
+            this.updatePage({
                pages,
                id
            });
        },
-        sectionsChanged({ sections, id }) {
-            this.$emit('sectionsChanged', {
+        addSection() {
+            const sectionTitle = this.sectionTitle;
+            const id = uuid();
+            const section = {
+                id,
+                isDefault: false,
+                isSelected: true,
+                name: `Unnamed ${sectionTitle}`,
+                pages: [],
+                sectionTitle
+            };
+
+            this.sections.forEach(s => s.isSelected = false);
+            const sections = this.sections.concat(section);
+
+            this.updateSection({
+                sections,
+                id
+            });
+        },
+        toggleNav() {
+            this.$emit('toggleNav');
+        },
+        updatePage({ pages, id }) {
+            this.$emit('updatePage', {
+                pages,
+                id
+            });
+        },
+        updateSection({ sections, id }) {
+            this.$emit('updateSection', {
                sections,
                id
            });
--- a/src/plugins/notebook/utils/notebook-entries.js
+++ b/src/plugins/notebook/utils/notebook-entries.js
@@ -1,6 +1,6 @@
 import objectLink from '../../../ui/mixins/object-link';

-export const DEFAULT_CLASS = 'notebook-default';
+export const DEFAULT_CLASS = 'is-notebook-default';
 const TIME_BOUNDS = {
    START_BOUND: 'tc.startBound',
    END_BOUND: 'tc.endBound',
@@ -8,29 +8,6 @@ const TIME_BOUNDS = {
    END_DELTA: 'tc.endDelta'
 };

-export function addEntryIntoPage(notebookStorage, entries, entry) {
-    const defaultSection = notebookStorage.section;
-    const defaultPage = notebookStorage.page;
-    if (!defaultSection || !defaultPage) {
-        return;
-    }
-
-    const newEntries = JSON.parse(JSON.stringify(entries));
-    let section = newEntries[defaultSection.id];
-    if (!section) {
-        newEntries[defaultSection.id] = {};
-    }
-
-    let page = newEntries[defaultSection.id][defaultPage.id];
-    if (!page) {
-        newEntries[defaultSection.id][defaultPage.id] = [];
-    }
-
-    newEntries[defaultSection.id][defaultPage.id].push(entry);
-
-    return newEntries;
-}
-
 export function getHistoricLinkInFixedMode(openmct, bounds, historicLink) {
    if (historicLink.includes('tc.mode=fixed')) {
        return historicLink;
@@ -61,6 +38,35 @@ export function getHistoricLinkInFixedMode(openmct, bounds, historicLink) {
    return params.join('&');
 }

+export function getNotebookDefaultEntries(notebookStorage, domainObject) {
+    if (!notebookStorage || !domainObject) {
+        return null;
+    }
+
+    const defaultSection = notebookStorage.section;
+    const defaultPage = notebookStorage.page;
+    if (!defaultSection || !defaultPage) {
+        return null;
+    }
+
+    const configuration = domainObject.configuration;
+    const entries = configuration.entries || {};
+
+    let section = entries[defaultSection.id];
+    if (!section) {
+        section = {};
+        entries[defaultSection.id] = section;
+    }
+
+    let page = entries[defaultSection.id][defaultPage.id];
+    if (!page) {
+        page = [];
+        entries[defaultSection.id][defaultPage.id] = [];
+    }
+
+    return entries[defaultSection.id][defaultPage.id];
+}
+
 export function createNewEmbed(snapshotMeta, snapshot = '') {
    const {
        bounds,
@@ -114,25 +120,24 @@ export function addNotebookEntry(openmct, domainObject, notebookStorage, embed =
        ? [embed]
        : [];

+    const defaultEntries = getNotebookDefaultEntries(notebookStorage, domainObject);
    const id = `entry-${date}`;
-    const entry = {
+    defaultEntries.push({
        id,
        createdOn: date,
        text: entryText,
        embeds
-    };
+    });

-    const newEntries = addEntryIntoPage(notebookStorage, entries, entry);
-
-    addDefaultClass(domainObject, openmct);
-    openmct.objects.mutate(domainObject, 'configuration.entries', newEntries);
+    addDefaultClass(domainObject);
+    openmct.objects.mutate(domainObject, 'configuration.entries', entries);

    return id;
 }

 export function getNotebookEntries(domainObject, selectedSection, selectedPage) {
    if (!domainObject || !selectedSection || !selectedPage) {
-        return;
+        return null;
    }

    const configuration = domainObject.configuration;
@@ -140,12 +145,12 @@ export function getNotebookEntries(domainObject, selectedSection, selectedPage)

    let section = entries[selectedSection.id];
    if (!section) {
-        return;
+        return null;
    }

    let page = entries[selectedSection.id][selectedPage.id];
    if (!page) {
-        return;
+        return null;
    }

    return entries[selectedSection.id][selectedPage.id];
@@ -191,13 +196,14 @@ export function deleteNotebookEntries(openmct, domainObject, selectedSection, se

    delete entries[selectedSection.id][selectedPage.id];

-    mutateObject(openmct, domainObject, 'configuration.entries', entries);
+    openmct.objects.mutate(domainObject, 'configuration.entries', entries);
 }

-export function mutateObject(openmct, object, key, value) {
-    openmct.objects.mutate(object, key, value);
-}
+function addDefaultClass(domainObject) {
+    const classList = domainObject.classList || [];
+    if (classList.includes(DEFAULT_CLASS)) {
+        return;
+    }

-function addDefaultClass(domainObject, openmct) {
-    openmct.status.set(domainObject.identifier, DEFAULT_CLASS);
+    classList.push(DEFAULT_CLASS);
 }
--- a/src/plugins/notebook/utils/notebook-entriesSpec.js
+++ b/src/plugins/notebook/utils/notebook-entriesSpec.js
@@ -20,7 +20,7 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
 import * as NotebookEntries from './notebook-entries';
-import { createOpenMct, resetApplicationState } from 'utils/testing';
+import { createOpenMct, spyOnBuiltins, resetApplicationState } from 'utils/testing';

 const notebookStorage = {
    domainObject: {
@@ -121,6 +121,7 @@ describe('Notebook Entries:', () => {
    beforeEach(done => {
        openmct = createOpenMct();
        window.localStorage.setItem('notebook-storage', null);
+        spyOnBuiltins(['mutate'], openmct.objects);

        done();
    });
@@ -136,16 +137,24 @@ describe('Notebook Entries:', () => {
        expect(entries.length).toEqual(0);
    });

-    it('addNotebookEntry adds entry', (done) => {
-        const unlisten = openmct.objects.observe(notebookDomainObject, '*', (object) => {
-            const entries = NotebookEntries.getNotebookEntries(notebookDomainObject, selectedSection, selectedPage);
-
-            expect(entries.length).toEqual(1);
-            done();
-            unlisten();
-        });
-
+    it('addNotebookEntry mutates object', () => {
        NotebookEntries.addNotebookEntry(openmct, notebookDomainObject, notebookStorage);
+
+        expect(openmct.objects.mutate).toHaveBeenCalled();
+    });
+
+    it('addNotebookEntry adds entry', () => {
+        NotebookEntries.addNotebookEntry(openmct, notebookDomainObject, notebookStorage);
+        const entries = NotebookEntries.getNotebookEntries(notebookDomainObject, selectedSection, selectedPage);
+
+        expect(entries.length).toEqual(1);
+    });
+
+    it('getEntryPosById returns valid position', () => {
+        const entryId = NotebookEntries.addNotebookEntry(openmct, notebookDomainObject, notebookStorage);
+        const position = NotebookEntries.getEntryPosById(entryId, notebookDomainObject, selectedSection, selectedPage);
+
+        expect(position).toEqual(0);
    });

    it('getEntryPosById returns valid position', () => {
@@ -165,13 +174,22 @@ describe('Notebook Entries:', () => {
        expect(success).toBe(true);
    });

-    it('deleteNotebookEntries deletes correct page entries', () => {
+    it('deleteNotebookEntries mutates object', () => {
+        openmct.objects.mutate.calls.reset();
+
+        NotebookEntries.addNotebookEntry(openmct, notebookDomainObject, notebookStorage);
+        NotebookEntries.deleteNotebookEntries(openmct, notebookDomainObject, selectedSection, selectedPage);
+
+        expect(openmct.objects.mutate).toHaveBeenCalledTimes(2);
+    });
+
+    it('deleteNotebookEntries deletes correct entry', () => {
        NotebookEntries.addNotebookEntry(openmct, notebookDomainObject, notebookStorage);
        NotebookEntries.addNotebookEntry(openmct, notebookDomainObject, notebookStorage);

        NotebookEntries.deleteNotebookEntries(openmct, notebookDomainObject, selectedSection, selectedPage);
        const afterEntries = NotebookEntries.getNotebookEntries(notebookDomainObject, selectedSection, selectedPage);

-        expect(afterEntries).toEqual(undefined);
+        expect(afterEntries).toEqual(null);
    });
 });
--- a/src/plugins/notebook/utils/notebook-storage.js
+++ b/src/plugins/notebook/utils/notebook-storage.js
@@ -67,24 +67,3 @@ export function setDefaultNotebookPage(page) {
    notebookStorage.page = page;
    saveDefaultNotebook(notebookStorage);
 }
-
-export function validateNotebookStorageObject() {
-    const notebookStorage = getDefaultNotebook();
-
-    let valid = false;
-    if (notebookStorage) {
-        Object.entries(notebookStorage).forEach(([key, value]) => {
-            const validKey = key !== undefined && key !== null;
-            const validValue = value !== undefined && value !== null;
-            valid = validKey && validValue;
-        });
-    }
-
-    if (valid) {
-        return notebookStorage;
-    }
-
-    console.warn('Invalid Notebook object, clearing default notebook storage');
-
-    clearDefaultNotebook();
-}
--- a/src/plugins/persistence/couch/CouchObjectProvider.js
+++ b/src/plugins/persistence/couch/CouchObjectProvider.js
@@ -87,8 +87,7 @@ export default class CouchObjectProvider {
            }

            //Sometimes CouchDB returns the old rev which fetching the object if there is a document update in progress
-            //Only update the rev if it's the first time we're getting the object from CouchDB. Subsequent revs should only be updated by updates.
-            if (!this.objectQueue[key].pending && !this.objectQueue[key].rev) {
+            if (!this.objectQueue[key].pending) {
                this.objectQueue[key].updateRevision(response[REV]);
            }

--- a/src/plugins/plot/res/templates/mct-plot.html
+++ b/src/plugins/plot/res/templates/mct-plot.html
@@ -40,7 +40,7 @@
                <div class="c-state-indicator__alert-cursor-lock icon-cursor-lock" title="Cursor is point locked. Click anywhere in the plot to unlock."></div>
                <div class="plot-legend-item"
                     ng-class="{
-                        'is-status--missing': series.domainObject.status === 'missing'
+                        'is-missing': series.domainObject.status === 'missing'
                    }"
                     ng-repeat="series in series track by $index"
                >
@@ -48,7 +48,7 @@
                        <span class="plot-series-color-swatch"
                              ng-style="{ 'background-color': series.get('color').asHexString() }">
                        </span>
-                        <span class="is-status__indicator" title="This item is missing or suspect"></span>
+                        <span class="is-missing__indicator" title="This item is missing"></span>
                        <span class="plot-series-name">{{ series.nameWithUnit() }}</span>
                    </div>
                    <div class="plot-series-value hover-value-enabled value-to-display-{{ legend.get('valueToShowWhenCollapsed') }} {{ series.closest.mctLimitState.cssClass }}"
@@ -95,14 +95,14 @@
                    <tr ng-repeat="series in series"
                        class="plot-legend-item"
                        ng-class="{
-                            'is-status--missing': series.domainObject.status === 'missing'
+                            'is-missing': series.domainObject.status === 'missing'
                        }"
                    >
                        <td class="plot-series-swatch-and-name">
                            <span class="plot-series-color-swatch"
                                  ng-style="{ 'background-color': series.get('color').asHexString() }">
                            </span>
-                            <span class="is-status__indicator" title="This item is missing or suspect"></span>
+                            <span class="is-missing__indicator" title="This item is missing"></span>
                            <span class="plot-series-name">{{ series.get('name') }}</span>
                        </td>

--- a/src/plugins/plot/res/templates/plot.html
+++ b/src/plugins/plot/res/templates/plot.html
@@ -46,7 +46,7 @@
        </button>
    </div>

-    <div class="l-view-section u-style-receiver js-style-receiver">
+    <div class="l-view-section">
        <div class="c-loading--overlay loading"
            ng-show="!!pending"></div>
        <mct-plot config="controller.config"
--- a/src/plugins/plot/res/templates/stacked-plot.html
+++ b/src/plugins/plot/res/templates/stacked-plot.html
@@ -45,7 +45,7 @@
                title="Toggle grid lines">
        </button>
    </div>
-    <div class="l-view-section u-style-receiver js-style-receiver">
+    <div class="l-view-section">
        <div class="c-loading--overlay loading"
             ng-show="!!currentRequest.pending"></div>
        <div class="gl-plot child-frame u-inspectable"
--- a/src/plugins/plot/src/configuration/YAxisModel.js
+++ b/src/plugins/plot/src/configuration/YAxisModel.js
@@ -171,7 +171,6 @@ define([
         * Update yAxis format, values, and label from known series.
         */
        updateFromSeries: function (series) {
-            this.unset('displayRange');
            const plotModel = this.plot.get('domainObject');
            const label = _.get(plotModel, 'configuration.yAxis.label');
            const sampleSeries = series.first();
--- a/src/plugins/plugins.js
+++ b/src/plugins/plugins.js
@@ -59,8 +59,7 @@ define([
    './persistence/couch/plugin',
    './defaultRootName/plugin',
    './timeline/plugin',
-    './viewDatumAction/plugin',
-    './interceptors/plugin'
+    './viewDatumAction/plugin'
 ], function (
    _,
    UTCTimeSystem,
@@ -100,8 +99,7 @@ define([
    CouchDBPlugin,
    DefaultRootName,
    Timeline,
-    ViewDatumAction,
-    ObjectInterceptors
+    ViewDatumAction
 ) {
    const bundleMap = {
        LocalStorage: 'platform/persistence/local',
@@ -196,7 +194,6 @@ define([
    plugins.DefaultRootName = DefaultRootName.default;
    plugins.Timeline = Timeline.default;
    plugins.ViewDatumAction = ViewDatumAction.default;
-    plugins.ObjectInterceptors = ObjectInterceptors.default;

    return plugins;
 });
--- a/src/plugins/tabs/components/tabs.vue
+++ b/src/plugins/tabs/components/tabs.vue
@@ -20,8 +20,8 @@
            Drag objects here to add them to this view.
        </div>
        <div
-            v-for="(tab, index) in tabsList"
-            :key="tab.keyString"
+            v-for="(tab,index) in tabsList"
+            :key="index"
            class="c-tab c-tabs-view__tab"
            :class="{
                'is-current': isCurrent(tab)
@@ -29,13 +29,13 @@
            @click="showTab(tab, index)"
        >
            <div class="c-tabs-view__tab__label c-object-label"
-                 :class="[tab.status ? `is-status--${tab.status}` : '']"
+                 :class="{'is-missing': tab.domainObject.status === 'missing'}"
            >
                <div class="c-object-label__type-icon"
                     :class="tab.type.definition.cssClass"
                >
-                    <span class="is-status__indicator"
-                          :title="`This item is ${tab.status}`"
+                    <span class="is-missing__indicator"
+                          title="This item is missing"
                    ></span>
                </div>
                <span class="c-button__label c-object-label__name">{{ tab.domainObject.name }}</span>
@@ -47,8 +47,8 @@
        </div>
    </div>
    <div
-        v-for="tab in tabsList"
-        :key="tab.keyString"
+        v-for="(tab, index) in tabsList"
+        :key="index"
        class="c-tabs-view__object-holder"
        :class="{'c-tabs-view__object-holder--hidden': !isCurrent(tab)}"
    >
@@ -56,7 +56,6 @@
            v-if="internalDomainObject.keep_alive ? currentTab : isCurrent(tab)"
            class="c-tabs-view__object"
            :object="tab.domainObject"
-            :object-path="tab.objectPath"
        />
    </div>
 </div>
@@ -79,7 +78,7 @@ const unknownObjectType = {
 };

 export default {
-    inject: ['openmct', 'domainObject', 'composition', 'objectPath'],
+    inject: ['openmct', 'domainObject', 'composition'],
    components: {
        ObjectView
    },
@@ -140,10 +139,6 @@ export default {
        this.composition.off('remove', this.removeItem);
        this.composition.off('reorder', this.onReorder);

-        this.tabsList.forEach(tab => {
-            tab.statusUnsubscribe();
-        });
-
        this.unsubscribe();
        this.clearCurrentTabIndexFromURL();

@@ -197,19 +192,10 @@ export default {
        },
        addItem(domainObject) {
            let type = this.openmct.types.get(domainObject.type) || unknownObjectType;
-            let keyString = this.openmct.objects.makeKeyString(domainObject.identifier);
-            let status = this.openmct.status.get(domainObject.identifier);
-            let statusUnsubscribe = this.openmct.status.observe(keyString, (updatedStatus) => {
-                this.updateStatus(keyString, updatedStatus);
-            });
-            let objectPath = [domainObject].concat(this.objectPath.slice());
            let tabItem = {
                domainObject,
-                status,
-                statusUnsubscribe,
-                objectPath,
-                type,
-                keyString
+                type: type,
+                key: this.openmct.objects.makeKeyString(domainObject.identifier)
            };

            this.tabsList.push(tabItem);
@@ -225,12 +211,10 @@ export default {
        },
        removeItem(identifier) {
            let pos = this.tabsList.findIndex(tab =>
-                tab.domainObject.identifier.namespace === identifier.namespace && tab.domainObject.identifier.keyString === identifier.keyString
+                tab.domainObject.identifier.namespace === identifier.namespace && tab.domainObject.identifier.key === identifier.key
            );
            let tabToBeRemoved = this.tabsList[pos];

-            tabToBeRemoved.statusUnsubscribe();
-
            this.tabsList.splice(pos, 1);

            if (this.isCurrent(tabToBeRemoved)) {
@@ -268,7 +252,7 @@ export default {
            this.allowDrop = false;
        },
        isCurrent(tab) {
-            return this.currentTab.keyString === tab.keyString;
+            return this.currentTab.key === tab.key;
        },
        updateInternalDomainObject(domainObject) {
            this.internalDomainObject = domainObject;
@@ -286,16 +270,6 @@ export default {
        },
        clearCurrentTabIndexFromURL() {
            deleteSearchParam(this.searchTabKey);
-        },
-        updateStatus(keyString, status) {
-            let tabPos = this.tabsList.findIndex((tab) => {
-                return tab.keyString === keyString;
-            });
-
-            if (tabPos !== -1) {
-                let tab = this.tabsList[tabPos];
-                this.$set(tab, 'status', status);
-            }
        }
    }
 };
--- a/src/plugins/tabs/tabs.js
+++ b/src/plugins/tabs/tabs.js
@@ -38,7 +38,7 @@ define([
            canEdit: function (domainObject) {
                return domainObject.type === 'tabs';
            },
-            view: function (domainObject, objectPath) {
+            view: function (domainObject) {
                let component;

                return {
@@ -56,7 +56,6 @@ define([
                            provide: {
                                openmct,
                                domainObject,
-                                objectPath,
                                composition: openmct.composition.get(domainObject)
                            },
                            template: '<tabs-component :isEditing="isEditing"></tabs-component>'
--- a/src/plugins/telemetryTable/TelemetryTable.js
+++ b/src/plugins/telemetryTable/TelemetryTable.js
@@ -25,7 +25,6 @@ define([
    'lodash',
    './collections/BoundedTableRowCollection',
    './collections/FilteredTableRowCollection',
-    './TelemetryTableNameColumn',
    './TelemetryTableRow',
    './TelemetryTableColumn',
    './TelemetryTableUnitColumn',
@@ -35,7 +34,6 @@ define([
    _,
    BoundedTableRowCollection,
    FilteredTableRowCollection,
-    TelemetryTableNameColumn,
    TelemetryTableRow,
    TelemetryTableColumn,
    TelemetryTableUnitColumn,
@@ -73,24 +71,6 @@ define([
            openmct.time.on('timeSystem', this.refreshData);
        }

-        /**
-         * @private
-         */
-        addNameColumn(telemetryObject, metadataValues) {
-            let metadatum = metadataValues.find(m => m.key === 'name');
-            if (!metadatum) {
-                metadatum = {
-                    format: 'string',
-                    key: 'name',
-                    name: 'Name'
-                };
-            }
-
-            const column = new TelemetryTableNameColumn(this.openmct, telemetryObject, metadatum);
-
-            this.configuration.addSingleColumnForObject(telemetryObject, column);
-        }
-
        initialize() {
            if (this.domainObject.type === 'table') {
                this.filterObserver = this.openmct.objects.observe(this.domainObject, 'configuration.filters', this.updateFilters);
@@ -231,13 +211,7 @@ define([

        addColumnsForObject(telemetryObject) {
            let metadataValues = this.openmct.telemetry.getMetadata(telemetryObject).values();
-
-            this.addNameColumn(telemetryObject, metadataValues);
            metadataValues.forEach(metadatum => {
-                if (metadatum.key === 'name') {
-                    return;
-                }
-
                let column = this.createColumn(metadatum);
                this.configuration.addSingleColumnForObject(telemetryObject, column);
                // add units column if available
--- a/src/plugins/telemetryTable/ViewActions.js
+++ b/src/plugins/telemetryTable/ViewActions.js
@@ -30,7 +30,7 @@ let exportCSV = {
    },
    group: 'view'
 };
-let exportMarkedDataAsCSV = {
+let exportMarkedRows = {
    name: 'Export Marked Rows',
    key: 'export-csv-marked',
    description: "Export marked rows as CSV",
@@ -98,7 +98,7 @@ let autosizeColumns = {

 let viewActions = [
    exportCSV,
-    exportMarkedDataAsCSV,
+    exportMarkedRows,
    unmarkAllRows,
    pause,
    play,
--- a/src/plugins/telemetryTable/components/TelemetryFilterIndicator.vue
+++ b/src/plugins/telemetryTable/components/TelemetryFilterIndicator.vue
@@ -1,41 +1,18 @@
 <template>
 <div
-    class="c-table-indicator"
-    :class="{ 'is-filtering': filterNames.length > 0 }"
+    v-if="filterNames.length > 0"
+    :title="title"
+    class="c-filter-indication"
+    :class="{ 'c-filter-indication--mixed': hasMixedFilters }"
 >
-    <div
-        v-if="filterNames.length > 0"
-        class="c-table-indicator__filter c-table-indicator__elem c-filter-indication"
-        :class="{ 'c-filter-indication--mixed': hasMixedFilters }"
-        :title="title"
+    <span class="c-filter-indication__mixed">{{ label }}</span>
+    <span
+        v-for="(name, index) in filterNames"
+        :key="index"
+        class="c-filter-indication__label"
    >
-        <span class="c-filter-indication__mixed">{{ label }}</span>
-        <span
-            v-for="(name, index) in filterNames"
-            :key="index"
-            class="c-filter-indication__label"
-        >
-            {{ name }}
-        </span>
-    </div>
-
-    <div class="c-table-indicator__counts">
-        <span
-            :title="totalRows + ' rows visible after any filtering'"
-            class="c-table-indicator__elem c-table-indicator__row-count"
-        >
-            {{ totalRows }} Rows
-        </span>
-
-        <span
-            v-if="markedRows"
-            class="c-table-indicator__elem c-table-indicator__marked-count"
-            :title="markedRows + ' rows selected'"
-        >
-            {{ markedRows }} Marked
-        </span>
-
-    </div>
+        {{ name }}
+    </span>
 </div>
 </template>

@@ -50,16 +27,6 @@ const USE_GLOBAL = 'useGlobal';

 export default {
    inject: ['openmct', 'table'],
-    props: {
-        markedRows: {
-            type: Number,
-            default: 0
-        },
-        totalRows: {
-            type: Number,
-            default: 0
-        }
-    },
    data() {
        return {
            filterNames: [],
--- a/src/plugins/telemetryTable/components/sizing-row.vue
+++ b/src/plugins/telemetryTable/components/sizing-row.vue
@@ -1,54 +0,0 @@
-<template>
-<tr class="c-telemetry-table__sizing-tr"><td>SIZING ROW</td></tr>
-</template>
-
-<script>
-export default {
-    props: {
-        isEditing: {
-            type: Boolean,
-            default: false
-        }
-    },
-    watch: {
-        isEditing: function (isEditing) {
-            if (isEditing) {
-                this.pollForRowHeight();
-            } else {
-                this.clearPoll();
-            }
-        }
-    },
-    mounted() {
-        this.$nextTick().then(() => {
-            this.height = this.$el.offsetHeight;
-            this.$emit('change-height', this.height);
-        });
-        if (this.isEditing) {
-            this.pollForRowHeight();
-        }
-    },
-    destroyed() {
-        this.clearPoll();
-    },
-    methods: {
-        pollForRowHeight() {
-            this.clearPoll();
-            this.pollID = window.setInterval(this.heightPoll, 300);
-        },
-        clearPoll() {
-            if (this.pollID) {
-                window.clearInterval(this.pollID);
-                this.pollID = undefined;
-            }
-        },
-        heightPoll() {
-            let height = this.$el.offsetHeight;
-            if (height !== this.height) {
-                this.$emit('change-height', height);
-                this.height = height;
-            }
-        }
-    }
-};
-</script>
--- a/src/plugins/telemetryTable/components/table-footer-indicator.scss
+++ b/src/plugins/telemetryTable/components/table-footer-indicator.scss
@@ -1,29 +0,0 @@
-.c-table-indicator {
-    display: flex;
-    align-items: center;
-    font-size: 0.9em;
-    overflow: hidden;
-
-    &__elem {
-        @include ellipsize();
-        flex: 0 1 auto;
-        padding: 2px;
-        text-transform: uppercase;
-
-        > * {
-            //display: contents;
-        }
-    }
-
-    &__counts {
-        //background: rgba(deeppink, 0.1);
-        display: flex;
-        flex: 1 1 auto;
-        justify-content: flex-end;
-        overflow: hidden;
-
-        > * {
-            margin-left: $interiorMargin;
-        }
-    }
-}
--- a/src/plugins/telemetryTable/components/table-row.vue
+++ b/src/plugins/telemetryTable/components/table-row.vue
@@ -108,7 +108,8 @@ export default {
                    return {
                        viewHistoricalData: true,
                        viewDatumAction: true,
-                        getDatum: this.getDatum
+                        getDatum: this.getDatum,
+                        skipCache: true
                    };
                }
            }
@@ -191,8 +192,7 @@ export default {
                let contextualObjectPath = this.objectPath.slice();
                contextualObjectPath.unshift(domainObject);

-                let actionsCollection = this.openmct.actions.get(contextualObjectPath, this.actionsViewContext);
-                let allActions = actionsCollection.getActionsObject();
+                let allActions = this.openmct.actions.get(contextualObjectPath, this.actionsViewContext);
                let applicableActions = this.row.getContextMenuActions().map(key => allActions[key]);

                if (applicableActions.length) {
--- a/src/plugins/telemetryTable/components/table.scss
+++ b/src/plugins/telemetryTable/components/table.scss
@@ -9,9 +9,6 @@

 .c-telemetry-table {
    // Table that displays telemetry in a scrolling body area
-
-    @include fontAndSize();
-
    display: flex;
    flex-flow: column nowrap;
    justify-content: flex-start;
@@ -111,7 +108,7 @@
            display: flex; // flex-flow defaults to row nowrap (which is what we want) so no need to define
            align-items: stretch;
            position: absolute;
-            min-height: 18px; // Needed when a row has empty values in its cells
+            height: 18px; // Needed when a row has empty values in its cells

            .is-editing .l-layout__frame & {
                pointer-events: none;
@@ -153,41 +150,6 @@
            white-space: nowrap;
        }
    }
-
-    &__sizing-tr {
-        // A row element used to determine sizing of rows based on font size
-        visibility: hidden;
-        pointer-events: none;
-    }
-
-    &__footer {
-        $pt: 2px;
-        border-top: 1px solid $colorInteriorBorder;
-        margin-top: $interiorMargin;
-        padding: $pt 0;
-        overflow: hidden;
-        transition: all 250ms;
-
-        &:not(.is-filtering) {
-            .c-frame & {
-                height: 0;
-                padding: 0;
-                visibility: hidden;
-            }
-        }
-    }
-
-    .c-frame & {
-        // target .c-frame .c-telemetry-table {}
-        $pt: 2px;
-        &:hover {
-            .c-telemetry-table__footer:not(.is-filtering) {
-                height: $pt + 16px;
-                padding: initial;
-                visibility: visible;
-            }
-        }
-    }
 }

 /******************************* SPECIFIC CASE WRAPPERS */
--- a/src/plugins/telemetryTable/components/table.vue
+++ b/src/plugins/telemetryTable/components/table.vue
@@ -123,7 +123,7 @@
    <!-- alternate controlbar end  -->

    <div
-        class="c-table c-telemetry-table c-table--filterable c-table--sortable has-control-bar u-style-receiver js-style-receiver"
+        class="c-table c-telemetry-table c-table--filterable c-table--sortable has-control-bar"
        :class="{
            'loading': loading,
            'is-paused' : paused
@@ -232,10 +232,6 @@
            class="c-telemetry-table__sizing js-telemetry-table__sizing"
            :style="sizingTableWidth"
        >
-            <sizing-row
-                :is-editing="isEditing"
-                @change-height="setRowHeight"
-            />
            <tr>
                <template v-for="(title, key) in headers">
                    <th
@@ -255,11 +251,7 @@
                :object-path="objectPath"
            />
        </table>
-        <table-footer-indicator
-            class="c-telemetry-table__footer"
-            :marked-rows="markedRows.length"
-            :total-rows="totalNumberOfRows"
-        />
+        <telemetry-filter-indicator />
    </div>
 </div><!-- closes c-table-wrapper -->
 </template>
@@ -268,11 +260,10 @@
 import TelemetryTableRow from './table-row.vue';
 import search from '../../../ui/components/search.vue';
 import TableColumnHeader from './table-column-header.vue';
-import TableFooterIndicator from './table-footer-indicator.vue';
+import TelemetryFilterIndicator from './TelemetryFilterIndicator.vue';
 import CSVExporter from '../../../exporters/CSVExporter.js';
 import _ from 'lodash';
 import ToggleSwitch from '../../../ui/components/ToggleSwitch.vue';
-import SizingRow from './sizing-row.vue';

 const VISIBLE_ROW_COUNT = 100;
 const ROW_HEIGHT = 17;
@@ -284,9 +275,8 @@ export default {
        TelemetryTableRow,
        TableColumnHeader,
        search,
-        TableFooterIndicator,
-        ToggleSwitch,
-        SizingRow
+        TelemetryFilterIndicator,
+        ToggleSwitch
    },
    inject: ['table', 'openmct', 'objectPath'],
    props: {
@@ -361,8 +351,7 @@ export default {
            paused: false,
            markedRows: [],
            isShowingMarkedRowsOnly: false,
-            hideHeaders: configuration.hideHeaders,
-            totalNumberOfRows: 0
+            hideHeaders: configuration.hideHeaders
        };
    },
    computed: {
@@ -510,8 +499,6 @@ export default {
                    let filteredRows = this.table.filteredRows.getRows();
                    let filteredRowsLength = filteredRows.length;

-                    this.totalNumberOfRows = filteredRowsLength;
-
                    if (filteredRowsLength < VISIBLE_ROW_COUNT) {
                        end = filteredRowsLength;
                    } else {
@@ -560,7 +547,7 @@ export default {
            let columnWidths = {};
            let totalWidth = 0;
            let headerKeys = Object.keys(this.headers);
-            let sizingTableRow = this.sizingTable.children[1];
+            let sizingTableRow = this.sizingTable.children[0];
            let sizingCells = sizingTableRow.children;

            headerKeys.forEach((headerKey, headerIndex, array) => {
@@ -960,7 +947,7 @@ export default {
            return {
                type: 'telemetry-table',
                exportAllDataAsCSV: this.exportAllDataAsCSV,
-                exportMarkedDataAsCSV: this.exportMarkedDataAsCSV,
+                exportMarkedRows: this.exportMarkedRows,
                unmarkAllRows: this.unmarkAllRows,
                togglePauseByButton: this.togglePauseByButton,
                expandColumns: this.recalculateColumnWidths,
@@ -989,12 +976,6 @@ export default {
                this.viewActionsCollection.show(['autosize-columns']);
                this.viewActionsCollection.hide(['expand-columns']);
            }
-        },
-        setRowHeight(height) {
-            this.rowHeight = height;
-            this.setHeight();
-            this.calculateTableSize();
-            this.clearRowsAndRerender();
        }
    }
 };
--- a/src/plugins/telemetryTable/components/telemetry-filter-indicator.scss
+++ b/src/plugins/telemetryTable/components/telemetry-filter-indicator.scss
@@ -0,0 +1,37 @@
+.c-filter-indication {
+    @include userSelectNone();
+    background: $colorFilterBg;
+    color: $colorFilterFg;
+    display: flex;
+    align-items: center;
+    font-size: 0.9em;
+    margin-top: $interiorMarginSm;
+    padding: 2px;
+    text-transform: uppercase;
+
+    &:before {
+        font-family: symbolsfont-12px;
+        content: $glyph-icon-filter;
+        display: block;
+        font-size: 12px;
+        margin-right: $interiorMarginSm;
+    }
+
+    &__mixed {
+        margin-right: $interiorMarginSm;
+    }
+
+    &--mixed {
+        .c-filter-indication__mixed {
+            font-style: italic;
+        }
+    }
+
+    &__label {
+        + .c-filter-indication__label {
+            &:before {
+                content: ',';
+            }
+        }
+    }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Deep Tailor	646c871c76	Merge branch 'master' of https://github.com/nasa/openmct into three-dot-menu-proto	2020-10-19 10:29:38 -07:00
Deep Tailor	ba401b3341	fix lint errors	2020-10-18 15:55:39 -07:00
Deep Tailor	5ef02ec4a2	git enable legacy toolbar for legacy tables	2020-10-15 11:55:21 -07:00
Deep Tailor	d788031019	Merge branch 'master' of https://github.com/nasa/openmct into three-dot-menu-proto	2020-10-15 09:49:32 -07:00
Nikhil	d870874649	Alphanumeric notebook entry (#3387 ) * [Notebook] Copy label and value from alphanumeric in Layout directly to a Notebook entry #3299 * changes to use updated action API. * added 'copyToNotebook' + some refactor. * Added current default notebook name to 'Copy to Notebook' string. * string delimiter updated. * cleanup * updated per review comments * updated as per review comments. * fixed rebase issue. * corrected case in import. * fixed lint errors. * fixed test error, Unhandled promise rejection: TypeError: 'clipboard-write' * removed navigator.permissions.query check	2020-10-07 14:01:36 -07:00
Deep Tailor	711a7a2eb5	fix console error on changing types and canceling edit	2020-10-07 12:30:07 -07:00
Deep Tailor	c105a08cfe	add tests for viewDatum action plugin	2020-10-06 15:35:08 -07:00
Deep Tailor	b87375a809	remove vue style	2020-10-06 12:37:28 -07:00
Deep Tailor	9fed056d22	add a viewDatum Action	2020-10-06 12:37:00 -07:00
Deep Tailor	251bf21933	Merge branch 'master' into three-dot-menu-proto	2020-10-05 11:25:55 -07:00
Deep Tailor	a180bf7c02	fix lint error	2020-10-05 11:16:34 -07:00
Deep Tailor	ed8a54f0f9	fix broken spec files	2020-10-05 11:12:07 -07:00
Deep Tailor	ff3c2da0f9	fix broken tests and add update on isEditing for actionCollections	2020-10-05 10:31:01 -07:00
Deep Tailor	28d5821120	fix lint issues	2020-10-02 15:08:07 -07:00
Deep Tailor	f5ee457274	Merge branch 'master' into three-dot-menu-proto	2020-10-02 15:02:20 -07:00
Deep Tailor	9d2770e4d2	update according to andrews comments	2020-10-02 15:01:04 -07:00
Deep Tailor	8b25009816	reverse check for viewProvider.getViewContext	2020-10-02 11:48:47 -07:00
Deep Tailor	074fe4481a	linting fixes	2020-10-02 11:42:41 -07:00
Deep Tailor	fbd928b842	Merge branch 'master' of https://github.com/nasa/openmct into three-dot-menu-proto	2020-10-02 11:25:43 -07:00
Deep Tailor	110947db09	update according to review comments	2020-10-02 11:22:18 -07:00
Deep Tailor	ef91e92fbc	wip	2020-09-30 13:13:50 -07:00
Deep Tailor	d201cac4ac	update changes	2020-09-30 13:07:18 -07:00
Deep Tailor	dcb3ccfec7	use weak map to cache actionCollections	2020-09-30 12:44:28 -07:00
Deep Tailor	78522cd4f1	remove unecessary computed properties	2020-09-16 10:07:20 -07:00
Deep Tailor	ca232d45cc	notebook and menu switchers to use menu api	2020-09-16 09:57:29 -07:00
Deep Tailor	df495c841a	merge master	2020-09-16 09:07:26 -07:00
Deep Tailor	92a37ef36b	Merge branch 'master' into three-dot-menu-proto	2020-09-14 09:52:10 -07:00
Deep Tailor	fd731ca430	fix ladrow and tablerow use of contextMenus	2020-09-09 14:18:20 -07:00
Deep Tailor	263b1cd3d5	fix telemetry view view historical	2020-09-09 13:58:28 -07:00
Deep Tailor	978fc8b5a3	performance enhancements	2020-09-09 11:37:49 -07:00
Deep Tailor	698ccc5a35	fix bug with object update	2020-09-09 10:15:19 -07:00
Deep Tailor	e5aa5b5a5f	fix onDestroy error	2020-09-08 16:06:45 -07:00
Deep Tailor	b942988ef8	Merge branch 'master' of https://github.com/nasa/openmct into three-dot-menu-proto	2020-09-08 16:00:10 -07:00
Deep Tailor	1eec20f2ea	3 dot menu refactor (#3360 ) * refactoring actions api * wip * wip * almost done * fix lint issues	2020-09-08 15:59:42 -07:00
charlesh88	767a2048eb	Three dot menu implementation WIP - Hide frame control labels when object is within a Flexible Layout;	2020-09-03 13:04:48 -07:00
charlesh88	e65cf1661c	Three dot menu implementation WIP - Recast "Preview" action as "View";	2020-09-01 10:08:36 -07:00
charlesh88	0eae48646c	Three dot menu implementation WIP - Merge latest master, fix conflicts;	2020-08-31 14:09:01 -07:00
charlesh88	0ba8a275d2	Three dot menu implementation WIP - Fixed button title;	2020-08-27 08:56:32 -07:00
charlesh88	d8d32cc3ac	Three dot menu implementation WIP - Changed Snapshot-related buttons and menus to use `icon-camera`; - Normalized padding for c-icon-buttons; - Added a CSS class `c-so-view--<domainObject.type>` to allow sub-layouts with hidden frames to completely hide their headers and buttons - this is needed to avoid overlap collisions with further sub-objects; - Changed button styling in main view to be more in line with 'iconic' approach used elsewhere, enabled button labels where applicable; - Better, more consistent hover approach for `c-button` and `c-icon-button` controls; - Changed Snow theme constant hover `filter` value for better color matching; - Fixed `c-object-label` type-icon opacity; - Changed Snow theme constant for object name to fix inline editing of object name being too dark;	2020-08-25 18:47:55 -07:00
charlesh88	a800848fe1	Three dot menu implementation WIP - Make button labels hide/show based on frame size in Layout;	2020-08-25 14:30:40 -07:00
charlesh88	6881d98ba6	Three dot menu implementation WIP - Initial styling and hover behavior for Layout frame controls; - Defined default color for c-icon-buttons; - Changed buttons from `c-button` to `c-icon-button`;	2020-08-21 18:42:32 -07:00
charlesh88	48d077cd2e	Three dot menu implementation WIP - Merge in `add-glyphs-082020`;	2020-08-20 14:08:15 -07:00
charlesh88	030dd93c91	Add new glyphs - Grid on, grid off and camera;	2020-08-20 11:10:22 -07:00
charlesh88	03bf6fc0a3	Three dot menu implementation WIP - Add icomoon config JSON file;	2020-08-20 10:09:03 -07:00
charlesh88	ef0a2ed5d2	Three dot menu implementation WIP - Add new `icon-3-dots` glyph;	2020-08-20 10:08:52 -07:00
charlesh88	a40aa84752	Three dot menu implementation WIP - Add icomoon config JSON file;	2020-08-19 14:40:22 -07:00
charlesh88	d3b69dda82	Three dot menu implementation WIP - Add new `icon-3-dots` glyph;	2020-08-19 14:38:47 -07:00
charlesh88	d3126ebf5c	Three dot menu implementation WIP - Replace inline styling; - Style for c-menu `__section-separator` and `__section-hint` refined;	2020-08-19 12:59:20 -07:00
Deep Tailor	4479cbc7a2	abstract logic into actionAPI	2020-08-18 16:26:20 -07:00
Deep Tailor	f8ff44dac0	wip	2020-08-18 15:52:59 -07:00
Deep Tailor	8f4280d15b	fix table row marking	2020-08-18 15:43:00 -07:00
Deep Tailor	6daa27ff31	merge with master	2020-08-18 15:24:15 -07:00
Deep Tailor	43f6c3f85d	wip	2020-08-18 15:12:39 -07:00
Deep Tailor	1a7c76cf3e	updated to new actions API	2020-08-18 13:56:26 -07:00
Deep Tailor	cee9cd7bd1	working groups	2020-08-14 10:15:13 -07:00
Deep Tailor	c42df20281	combine domainObject actions and view actions	2020-08-13 18:42:58 -07:00
Deep Tailor	b4149bd2b3	working in objectFrame	2020-08-13 17:39:35 -07:00
Deep Tailor	f436ac9ba0	working proto	2020-08-13 16:26:29 -07:00
Deep Tailor	8493b481dd	make reviewer requested changes	2020-08-13 14:46:18 -07:00
Deep Tailor	28723b59b7	Merge branch 'master' into context-menu-option	2020-06-10 16:36:33 -07:00
Deep Tailor	9fa7de0b77	remove unused files	2020-06-10 16:30:24 -07:00
Deep Tailor	54bfc84ada	replaced contextMenu with overlay menu	2020-06-10 16:06:42 -07:00