diff --git a/platform/features/timeline/bundle.js b/platform/features/timeline/bundle.js
index a6c0931f4e..eb66456ce4 100644
--- a/platform/features/timeline/bundle.js
+++ b/platform/features/timeline/bundle.js
@@ -127,7 +127,16 @@ define([
                             14400000,
                             28800000,
                             43200000,
-                            86400000
+                            86400000,
+                            86400000 * 2,
+                            86400000 * 5,
+                            86400000 * 10,
+                            86400000 * 20,
+                            86400000 * 30,
+                            86400000 * 60,
+                            86400000 * 120,
+                            86400000 * 240,
+                            86400000 * 365
                         ],
                         "width": 200
                     }
diff --git a/platform/features/timeline/res/templates/timeline.html b/platform/features/timeline/res/templates/timeline.html
index 41a1c67a87..0bb53d1196 100644
--- a/platform/features/timeline/res/templates/timeline.html
+++ b/platform/features/timeline/res/templates/timeline.html
@@ -103,6 +103,13 @@
         <!-- TOP PANE GANTT BARS -->
         <div class="split-pane-component l-timeline-pane t-pane-h l-pane-top t-timeline-gantt l-timeline-gantt s-timeline-gantt">
             <div class="l-hover-btns-holder s-hover-btns-holder t-btns-zoom">
+                <a class="t-btn l-btn s-btn"
+                   ng-click="zoomController.fit()"
+                   ng-show="true"
+                   title="Zoom to fit">
+                    <span class="ui-symbol icon zoom-in">I</span>
+                </a>
+
                 <a class="t-btn l-btn s-btn"
                    ng-click="zoomController.zoom(-1)"
                    ng-show="true"
@@ -121,7 +128,7 @@
             <div style="overflow: hidden; position: absolute; left: 0; top: 0; right: 0; height: 30px;" mct-scroll-x="scroll.x">
                 <mct-include key="'timeline-ticks'"
                              parameters="{
-                                         fullWidth: zoomController.toPixels(zoomController.duration()),
+                                         fullWidth: timelineController.width(zoomController),
                                          start: scroll.x,
                                          width: scroll.width,
                                          step: zoomController.toPixels(zoomController.zoom()),
diff --git a/platform/features/timeline/src/controllers/TimelineZoomController.js b/platform/features/timeline/src/controllers/TimelineZoomController.js
index 4c8acd0061..990a83a5b3 100644
--- a/platform/features/timeline/src/controllers/TimelineZoomController.js
+++ b/platform/features/timeline/src/controllers/TimelineZoomController.js
@@ -32,16 +32,26 @@ define(
             var zoomLevels = ZOOM_CONFIGURATION.levels || [1000],
                 zoomIndex = Math.floor(zoomLevels.length / 2),
                 tickWidth = ZOOM_CONFIGURATION.width || 200,
+                bounds = { x: 0, width: tickWidth },
                 duration = 86400000; // Default duration in view
 
             // Round a duration to a larger value, to ensure space for editing
             function roundDuration(value) {
                 // Ensure there's always an extra day or so
-                var sz = zoomLevels[zoomLevels.length - 1];
+                var tickCount = bounds.width / tickWidth,
+                    sz = zoomLevels[zoomLevels.length - 1] * tickCount;
                 value *= 1.25; // Add 25% padding to start
                 return Math.ceil(value / sz) * sz;
             }
 
+            function toMillis(pixels) {
+                return (pixels / tickWidth) * zoomLevels[zoomIndex];
+            }
+
+            function toPixels(millis) {
+                return tickWidth * millis / zoomLevels[zoomIndex];
+            }
+
             // Get/set zoom level
             function setZoomLevel(level) {
                 if (!isNaN(level)) {
@@ -53,20 +63,27 @@ define(
                 }
             }
 
-            // Persist current zoom level
-            function storeZoom() {
-                var isEditMode = $scope.commit &&
-                    $scope.domainObject &&
-                    $scope.domainObject.hasCapability('editor') &&
-                    $scope.domainObject.getCapability('editor').inEditContext();
-                if (isEditMode) {
-                    $scope.configuration = $scope.configuration || {};
-                    $scope.configuration.zoomLevel = zoomIndex;
-                    $scope.commit();
+            function initializeZoomFromTimespan(timespan) {
+                var timelineDuration = timespan.getDuration();
+                zoomIndex = 0;
+                while (toMillis(bounds.width) < timelineDuration &&
+                        zoomIndex < zoomLevels.length - 1) {
+                    zoomIndex += 1;
+                }
+                bounds.x = toPixels(timespan.getStart());
+            }
+
+            function initializeZoom() {
+                if ($scope.domainObject) {
+                    $scope.domainObject.useCapability('timespan')
+                        .then(initializeZoomFromTimespan);
                 }
             }
 
-            $scope.$watch("configuration.zoomLevel", setZoomLevel);
+            $scope.$watch("scroll", function (scroll) {
+                bounds = scroll;
+            });
+            $scope.$watch("domainObject", initializeZoom);
 
             return {
                 /**
@@ -83,27 +100,29 @@ define(
                 zoom: function (amount) {
                     // Update the zoom level if called with an argument
                     if (arguments.length > 0 && !isNaN(amount)) {
+                        var center = this.toMillis(bounds.x + bounds.width / 2);
                         setZoomLevel(zoomIndex + amount);
-                        storeZoom(zoomIndex);
+                        bounds.x = this.toPixels(center) - bounds.width / 2;
                     }
                     return zoomLevels[zoomIndex];
                 },
+                /**
+                 * Set the zoom level to fit the bounds of the timeline
+                 * being viewed.
+                 */
+                fit: initializeZoom,
                 /**
                  * Get the width, in pixels, of a specific time duration at
                  * the current zoom level.
                  * @returns {number} the number of pixels
                  */
-                toPixels: function (millis) {
-                    return tickWidth * millis / zoomLevels[zoomIndex];
-                },
+                toPixels: toPixels,
                 /**
                  * Get the time duration, in milliseconds, occupied by the
                  * width (specified in pixels) at the current zoom level.
                  * @returns {number} the number of pixels
                  */
-                toMillis: function (pixels) {
-                    return (pixels / tickWidth) * zoomLevels[zoomIndex];
-                },
+                toMillis: toMillis,
                 /**
                  * Get or set the current displayed duration. If used as a
                  * setter, this will typically be rounded up to ensure extra
diff --git a/platform/features/timeline/test/controllers/TimelineZoomControllerSpec.js b/platform/features/timeline/test/controllers/TimelineZoomControllerSpec.js
index 1365fca7d6..47e79fefa8 100644
--- a/platform/features/timeline/test/controllers/TimelineZoomControllerSpec.js
+++ b/platform/features/timeline/test/controllers/TimelineZoomControllerSpec.js
@@ -32,11 +32,7 @@ define(
 
             beforeEach(function () {
                 testConfiguration = {
-                    levels: [
-                        1000,
-                        2000,
-                        3500
-                    ],
+                    levels: [1000, 2000, 3500],
                     width: 12321
                 };
                 mockScope = jasmine.createSpyObj("$scope", ['$watch']);
@@ -74,32 +70,61 @@ define(
                 expect(controller.zoom()).toEqual(3500);
             });
 
-            it("does not normally persist zoom changes", function () {
-                controller.zoom(1);
-                expect(mockScope.commit).not.toHaveBeenCalled();
+            it("observes scroll bounds", function () {
+                expect(mockScope.$watch)
+                    .toHaveBeenCalledWith("scroll", jasmine.any(Function));
             });
 
-            it("persists zoom changes in Edit mode", function () {
-                mockScope.domainObject = jasmine.createSpyObj(
-                    'domainObject',
-                    ['hasCapability', 'getCapability']
-                );
-                mockScope.domainObject.hasCapability.andCallFake(function (c) {
-                    return c === 'editor';
+            describe("when watches have fired", function () {
+                var mockDomainObject,
+                    mockPromise,
+                    mockTimespan,
+                    testStart,
+                    testEnd;
+
+                beforeEach(function () {
+                    testStart = 3000;
+                    testEnd = 5500;
+
+                    mockDomainObject = jasmine.createSpyObj('domainObject', [
+                        'getId',
+                        'getModel',
+                        'getCapability',
+                        'useCapability'
+                    ]);
+                    mockPromise = jasmine.createSpyObj('promise', ['then']);
+                    mockTimespan = jasmine.createSpyObj('timespan', [
+                        'getStart',
+                        'getEnd',
+                        'getDuration'
+                    ]);
+
+                    mockDomainObject.useCapability.andCallFake(function (c) {
+                        return c === 'timespan' && mockPromise;
+                    });
+                    mockPromise.then.andCallFake(function (callback) {
+                        callback(mockTimespan);
+                    });
+                    mockTimespan.getStart.andReturn(testStart);
+                    mockTimespan.getEnd.andReturn(testEnd);
+                    mockTimespan.getDuration.andReturn(testEnd - testStart);
+
+                    mockScope.scroll = { x: 0, width: 20000 };
+                    mockScope.domainObject = mockDomainObject;
+
+                    mockScope.$watch.calls.forEach(function (call) {
+                        call.args[1](mockScope[call.args[0]]);
+                    });
                 });
-                mockScope.domainObject.getCapability.andCallFake(function (c) {
-                    if (c === 'editor') {
-                        return {
-                            inEditContext: function () {
-                                return true;
-                            }
-                        };
-                    }
+
+                it("zooms to fit the timeline", function () {
+                    var x1 = mockScope.scroll.x,
+                        x2 = mockScope.scroll.x + mockScope.scroll.width;
+                    expect(Math.round(controller.toMillis(x1)))
+                        .toEqual(testStart);
+                    expect(Math.round(controller.toMillis(x2)))
+                        .toBeGreaterThan(testEnd);
                 });
-                controller.zoom(1);
-                expect(mockScope.commit).toHaveBeenCalled();
-                expect(mockScope.configuration.zoomLevel)
-                    .toEqual(jasmine.any(Number));
             });
 
         });