diff --git a/LesionTracker/client/compatibility/lesionTool.js b/LesionTracker/client/compatibility/lesionTool.js
index 389091db9..14fa4add9 100644
--- a/LesionTracker/client/compatibility/lesionTool.js
+++ b/LesionTracker/client/compatibility/lesionTool.js
@@ -282,4 +282,9 @@ var cornerstoneTools = (function ($, cornerstone, cornerstoneMath, cornerstoneTo
         toolType: toolType
     });
     return cornerstoneTools;
-}($, cornerstone, cornerstoneMath, cornerstoneTools));
\ No newline at end of file
+}($, cornerstone, cornerstoneMath, cornerstoneTools));
+
+toolManager.addTool('lesion', {
+    mouse: cornerstoneTools.lesion,
+    touch: cornerstoneTools.lesionTouch
+});
\ No newline at end of file
diff --git a/LesionTracker/client/components/hidingPanel/hidingPanel.styl b/LesionTracker/client/components/hidingPanel/hidingPanel.styl
index bff3dc975..63aa6b9a4 100644
--- a/LesionTracker/client/components/hidingPanel/hidingPanel.styl
+++ b/LesionTracker/client/components/hidingPanel/hidingPanel.styl
@@ -1,9 +1,6 @@
 .hidingPanel
   width: 12%
   height: 100%
-  margin-top: 35px
+  padding-top: 35px
   position: relative
-  float: left
-  overflow: auto
-  background-color: blue
-  color: black
\ No newline at end of file
+  float: left
\ No newline at end of file
diff --git a/LesionTracker/client/components/lesionMeasurementContainer/lesionMeasurementContainer.html b/LesionTracker/client/components/lesionMeasurementContainer/lesionMeasurementContainer.html
new file mode 100644
index 000000000..70b990a2b
--- /dev/null
+++ b/LesionTracker/client/components/lesionMeasurementContainer/lesionMeasurementContainer.html
@@ -0,0 +1,5 @@
+<template name="lesionMeasurementContainer">
+    <div class="lesionMeasurementContainer">
+        Table of lesion locations goes here
+    </div>
+</template>
\ No newline at end of file
diff --git a/LesionTracker/client/components/lesionMeasurementContainer/lesionMeasurementContainer.styl b/LesionTracker/client/components/lesionMeasurementContainer/lesionMeasurementContainer.styl
new file mode 100644
index 000000000..41a05cb28
--- /dev/null
+++ b/LesionTracker/client/components/lesionMeasurementContainer/lesionMeasurementContainer.styl
@@ -0,0 +1,7 @@
+.lesionMeasurementContainer
+  width: 24%
+  float: left
+  height: 100%
+  
+  background-color: white
+  border: 8px solid lightblue
\ No newline at end of file
diff --git a/LesionTracker/client/components/lesionTableContainer/lesionTableContainer.html b/LesionTracker/client/components/lesionTableContainer/lesionTableContainer.html
new file mode 100644
index 000000000..2caf2f007
--- /dev/null
+++ b/LesionTracker/client/components/lesionTableContainer/lesionTableContainer.html
@@ -0,0 +1,5 @@
+<template name="lesionTableContainer">
+    <div class="lesionTableContainer">
+        Current, Prior, Nadir, Baseline go here
+    </div>
+</template>
\ No newline at end of file
diff --git a/LesionTracker/client/components/lesionTableContainer/lesionTableContainer.styl b/LesionTracker/client/components/lesionTableContainer/lesionTableContainer.styl
new file mode 100644
index 000000000..5cf65bb5d
--- /dev/null
+++ b/LesionTracker/client/components/lesionTableContainer/lesionTableContainer.styl
@@ -0,0 +1,7 @@
+.lesionTableContainer
+  background-color: pink
+  height: 25%
+  max-height: 200px
+  
+  background-color: white
+  border: 8px solid pink
diff --git a/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.html b/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.html
new file mode 100644
index 000000000..4f6f8c3d4
--- /dev/null
+++ b/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.html
@@ -0,0 +1,16 @@
+<template name="lesionTrackerLayout">
+    <nav class="navbar navbar-default" role="navigation">
+        <div class="container-fluid">
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+                  <span class="sr-only">Toggle navigation</span>
+                  <span class="icon-bar"></span>
+                  <span class="icon-bar"></span>
+                  <span class="icon-bar"></span>
+                </button>
+                <a class="navbar-brand" href="/">Lesion Tracker</a>
+            </div>
+        </div>
+    </nav>
+    {{> yield}}
+</template>
\ No newline at end of file
diff --git a/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.styl b/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.styl
new file mode 100644
index 000000000..2629a51f8
--- /dev/null
+++ b/LesionTracker/client/components/lesionTrackerLayout/lesionTrackerLayout.styl
@@ -0,0 +1,18 @@
+.navbar
+  margin-bottom: 0
+  border-radius: 0px
+
+.navbar-form
+  margin: 0
+  padding: 15px 3px
+
+.navbar-default
+  -webkit-transition: background-color 200ms linear
+  -moz-transition: background-color 200ms linear
+  -o-transition: background-color 200ms linear
+  -ms-transition: background-color 200ms linear
+  transition: background-color 200ms linear
+  
+@media (min-width: 768px)
+  .navbar
+    border-radius: 0px
\ No newline at end of file
diff --git a/LesionTracker/client/components/toolbar/toolbar.css b/LesionTracker/client/components/toolbar/toolbar.css
deleted file mode 100644
index 21cbff5c8..000000000
--- a/LesionTracker/client/components/toolbar/toolbar.css
+++ /dev/null
@@ -1,48 +0,0 @@
-.toolbar {
-    width: 100%;
-    height: 35px;
-    text-align: center;
-}
-
-#toolbar-group button {
-    text-align: center;
-    margin-top: 2px;
-    margin-right: 3px;
-    margin-left: 3px;
-    color: #ffffff;
-    background-color: black;
-    width: 30px;
-    height: 30px;
-    border: 1px solid white;
-}
-
-#toolbar-group button > span {
-    width: 12px;
-    height: 12px;
-    position: absolute;
-    top: 9px;
-    left: 9px;
-    right: 9px;
-    bottom: 9px;
-}
-
-
-#toolbar-group .btn:hover {
-    border-width: 3px;
-    background-color: transparent;
-    color: white;
-}
-#toolbar-group .btn:focus, .btn:active {
-    outline: 0 !important;
-    border-width: 5px;
-    background-color: transparent;
-    color:white;
-    text-align: center;
-}
-
-#toolbar-group .btn:focus > span{
-    top: 6px;
-    left: 6px;
-    right: 6px;
-    bottom: 6px;
-}
\ No newline at end of file
diff --git a/LesionTracker/client/components/toolbar/toolbar.html b/LesionTracker/client/components/toolbar/toolbar.html
index e40c066f7..710e5de5a 100644
--- a/LesionTracker/client/components/toolbar/toolbar.html
+++ b/LesionTracker/client/components/toolbar/toolbar.html
@@ -1,16 +1,26 @@
 <template name="toolbar">
-    <div id="toolbar" class="toolbar">
-        <div id="toolbar-group" class="btn-group">
+    <div id='toolbar'>
+        <div class="btn-group">
             <!-- WW/WL -->
-            <button id="wwwc" type="button" class="imageViewerTool btn btn-sm btn-toolbar" data-container="body" data-toggle="tooltip" data-placement="bottom" title="WW/WC"><span class="fa fa-sun-o"></span></button>
+            <button id="wwwc" type="button" class="imageViewerTool btn btn-sm btn-default" data-container="body" data-toggle="tooltip" data-placement="bottom" title="WW/WC"><span class="fa fa-sun-o"></span></button>
             <!-- Invert -->
-            <button id="invert" type="button" class="imageViewerCommand btn btn-sm btn-toolbar" data-container="body" data-toggle="tooltip" data-placement="bottom" title="Invert"><span class="fa fa-adjust"></span></button>
+            <button id="invert" type="button" class="imageViewerCommand btn btn-sm btn-default" data-container="body" data-toggle="tooltip" data-placement="bottom" title="Invert"><span class="fa fa-adjust"></span></button>
             <!-- Zoom -->
-            <button id="zoom" type="button" class="imageViewerTool btn btn-sm btn-toolbar" data-container="body" data-toggle="tooltip" data-placement="bottom" title="Zoom"><span class="fa fa-search"></span></button>
+            <button id="zoom" type="button" class="imageViewerTool btn btn-sm btn-default" data-container="body" data-toggle="tooltip" data-placement="bottom" title="Zoom"><span class="fa fa-search"></span></button>
             <!-- Pan -->
-            <button id="pan" type="button" class="imageViewerTool btn btn-sm btn-toolbar" data-container="body" data-toggle="tooltip" data-placement="bottom" title="Pan"><span class="fa fa-arrows"></span></button>
+            <button id="pan" type="button" class="imageViewerTool btn btn-sm btn-default" data-container="body" data-toggle="tooltip" data-placement="bottom" title="Pan"><span class="fa fa-arrows"></span></button>
             <!-- Stack scroll -->
-            <button id="stackScroll" type="button" class="imageViewerTool btn btn-sm btn-toolbar" data-container="body" data-toggle="tooltip" data-placement="bottom" title="Stack Scroll"><span class="fa fa-bars"></span></button>
+            <button id="stackScroll" type="button" class="imageViewerTool btn btn-sm btn-default" data-container="body" data-toggle="tooltip" data-placement="bottom" title="Stack Scroll"><span class="fa fa-bars"></span></button>
+            <!-- Length measurement -->
+            <button id="length" type="button" class="imageViewerTool btn btn-sm btn-default" data-container="body" data-toggle="tooltip" data-placement="bottom" title="Length Measurement"><span class="fa fa-arrows-v"></span></button>
+            <!-- Angle measurement -->
+            <!--<button id="angle" type="button" class="imageViewerTool btn btn-sm btn-default" data-container="body" data-toggle="tooltip" data-placement="bottom" title="Angle Measurement"><span class="fa fa-angle-left"></span></button>-->
+            <!-- Pixel probe -->
+            <button id="dragProbe" type="button" class="imageViewerTool btn btn-sm btn-default" data-container="body" data-toggle="tooltip" data-placement="bottom" title="Pixel Probe"><span class="fa fa-dot-circle-o"></span></button>
+            <!-- Elliptical ROI -->
+            <button id="ellipticalRoi" type="button" class="imageViewerTool btn btn-sm btn-default" data-container="body" data-toggle="tooltip" data-placement="bottom" title="Elliptical ROI"><span class="fa fa-circle-o"></span></button>
+            <!-- Rectangle ROI -->
+            <button id="rectangleRoi" type="button" class="imageViewerTool btn btn-sm btn-default" data-container="body" data-toggle="tooltip" data-placement="bottom" title="Rectangle ROI"><span class="fa fa-square-o"></span></button>
             <!-- Play clip -->
             <button id="playClip" type="button" class="imageViewerCommand btn btn-sm btn-default" data-container="body" data-toggle="tooltip" data-placement="bottom" title="Play/Stop Clip">
                 {{ #if isPlaying }}
@@ -19,16 +29,8 @@
                     <span class="fa fa-play"></span>
                 {{ /if }}
             </button>
-            <!-- Angle measurement -->
-            <!--<button id="angle" type="button" class="imageViewerTool btn btn-sm btn-default" data-container="body" data-toggle="tooltip" data-placement="bottom" title="Angle Measurement"><span class="fa fa-angle-left"></span></button>-->
-            <!-- Pixel probe -->
-            <button id="dragProbe" type="button" class="imageViewerTool btn btn-sm btn-toolbar" data-container="body" data-toggle="tooltip" data-placement="bottom" title="Pixel Probe"><span class="fa fa-dot-circle-o"></span></button>
-            <!-- Length measurement -->
-            <button id="length" type="button" class="imageViewerTool btn btn-sm btn-toolbar" data-container="body" data-toggle="tooltip" data-placement="bottom" title="Length Measurement"><span class="fa fa-arrows-v"></span></button>
-            <!-- Elliptical ROI -->
-            <button id="ellipticalRoi" type="button" class="imageViewerTool btn btn-sm btn-toolbar" data-container="body" data-toggle="tooltip" data-placement="bottom" title="Elliptical ROI"><span class="fa fa-circle-o"></span></button>
-            <!-- Rectangle ROI -->
-            <button id="rectangleRoi" type="button" class="imageViewerTool btn btn-sm btn-toolbar" data-container="body" data-toggle="tooltip" data-placement="bottom" title="Rectangle ROI"><span class="fa fa-square-o"></span></button>
+            <!--<button id="layout" type="button" class="btn btn-sm btn-default dropdown-toggle" data-container="body" data-toggle="dropdown" aria-expanded="false" data-placement="right" title="Layout" rel="tooltip"><span class="fa fa-th-large"></span></button>
+            {{> layoutChooser}}-->
             <!-- Lesion Tool -->
             <button id="lesion" type="button" class="imageViewerTool btn btn-sm btn-toolbar" data-container="body" data-toggle="tooltip" data-placement="bottom" title="Lesion Tool"><span class="fa fa-arrows-v"></span></button>
         </div>
diff --git a/LesionTracker/client/components/toolbar/toolbar.js b/LesionTracker/client/components/toolbar/toolbar.js
index 2aeb7a4cb..0c206148e 100644
--- a/LesionTracker/client/components/toolbar/toolbar.js
+++ b/LesionTracker/client/components/toolbar/toolbar.js
@@ -9,13 +9,9 @@ Template.toolbar.events({
         if (!OHIF.viewer.functionList.hasOwnProperty(command)) {
             return;
         }
-
-        // TODO = Add support for active viewports
-        //var element = getActiveViewportElement();
-        $('.imageViewer').each(function() {
-            var element = this;
-            OHIF.viewer.functionList[command](element);
-        });
+        var viewportIndex = Session.get('ActiveViewport');
+        var element = $('.imageViewerViewport').get(viewportIndex);
+        OHIF.viewer.functionList[command](element);
     }
 });
 
@@ -26,9 +22,12 @@ Template.toolbar.onRendered(function() {
     // Enable tooltips for the layout button
     var extraTooltipButtons = $('[rel="tooltip"]');
     extraTooltipButtons.tooltip(OHIF.viewer.tooltipConfig);
+});
 
-    toolManager.addTool('lesion', {
-        mouse: cornerstoneTools.lesion,
-        touch: cornerstoneTools.lesionTouch
-    });
+Template.toolbar.helpers({
+    'isPlaying': function() {
+        Session.get('UpdateCINE');
+        var viewportIndex = Session.get('ActiveViewport');
+        return !!OHIF.viewer.isPlaying[viewportIndex];
+    }
 });
\ No newline at end of file
diff --git a/OHIFViewer/client/components/viewer/toolRow/toolbar.styl b/LesionTracker/client/components/toolbar/toolbar.styl
similarity index 100%
rename from OHIFViewer/client/components/viewer/toolRow/toolbar.styl
rename to LesionTracker/client/components/toolbar/toolbar.styl
diff --git a/LesionTracker/client/components/viewer.css b/LesionTracker/client/components/viewer.css
index 3dd2e3f77..f2b5f572f 100644
--- a/LesionTracker/client/components/viewer.css
+++ b/LesionTracker/client/components/viewer.css
@@ -1,7 +1,12 @@
-.viewer{
+.viewer {
     width: 100%;
-    height: 100%;
+    height: calc(100% - 54px);
     margin: 0;
     padding: 0;
     background-color: black;
 }
+
+.navbar {
+    margin-bottom: 0;
+    border-radius: 0;
+}
\ No newline at end of file
diff --git a/LesionTracker/client/components/viewer.html b/LesionTracker/client/components/viewer.html
index 7f6bd47ad..fb9d3b3eb 100644
--- a/LesionTracker/client/components/viewer.html
+++ b/LesionTracker/client/components/viewer.html
@@ -5,5 +5,6 @@
     <div id="viewer" class="viewer">
         {{ >hidingPanel }}
         {{ >viewerMain }}
+        {{ >lesionMeasurementContainer }}
     </div>
 </template>
\ No newline at end of file
diff --git a/LesionTracker/client/components/viewer.js b/LesionTracker/client/components/viewer.js
index d7b3e0584..bfcc9709e 100644
--- a/LesionTracker/client/components/viewer.js
+++ b/LesionTracker/client/components/viewer.js
@@ -60,7 +60,7 @@ function resizeViewports() {
 
 Session.setDefault('ActiveViewport', 0);
 Session.setDefault('viewportRows', 1);
-Session.setDefault('viewportColumns', 1);
+Session.setDefault('viewportColumns', 2);
 
 // Avoid doing DOM manipulation during the resize handler
 // because it is fired very often.
diff --git a/LesionTracker/client/components/viewerMain/viewerMain.css b/LesionTracker/client/components/viewerMain/viewerMain.css
deleted file mode 100644
index fe6a741cb..000000000
--- a/LesionTracker/client/components/viewerMain/viewerMain.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.viewerMain {
-    width: 88%;
-    height: 100%;
-    margin-left: 12%;
-}
\ No newline at end of file
diff --git a/LesionTracker/client/components/viewerMain/viewerMain.html b/LesionTracker/client/components/viewerMain/viewerMain.html
index 3113df387..94cf7fa71 100644
--- a/LesionTracker/client/components/viewerMain/viewerMain.html
+++ b/LesionTracker/client/components/viewerMain/viewerMain.html
@@ -2,6 +2,7 @@
     <div class="viewerMain">
         {{> toolbar}}
         {{> imageViewerViewports}}
+        {{> lesionTableContainer}}
         <!--TODO: Bottom lesion table container will be here-->
     </div>
 </template>
\ No newline at end of file
diff --git a/LesionTracker/client/components/viewerMain/viewerMain.styl b/LesionTracker/client/components/viewerMain/viewerMain.styl
new file mode 100644
index 000000000..57d9ab8c9
--- /dev/null
+++ b/LesionTracker/client/components/viewerMain/viewerMain.styl
@@ -0,0 +1,8 @@
+.viewerMain
+  width: 64%;
+  height: 100%
+  float: left
+
+#imageViewerViewports
+  height: calc(75% - 30px)
+  width: 100%
\ No newline at end of file
diff --git a/LesionTracker/client/route.js b/LesionTracker/client/route.js
index eca66daf3..f8a6ced20 100644
--- a/LesionTracker/client/route.js
+++ b/LesionTracker/client/route.js
@@ -1,5 +1,5 @@
 Router.configure({
-  layoutTemplate: 'layout',
+  layoutTemplate: 'lesionTrackerLayout',
   //loadingTemplate: '',
   notFoundTemplate: 'notFound'
 });
@@ -14,7 +14,7 @@ Router.route('/', function () {
 ViewerStudies = new Mongo.Collection(null);
 
 Router.route('/viewer/:_id', {
-  layoutTemplate: 'layout',
+  layoutTemplate: 'lesionTrackerLayout',
   name: 'viewer',
   onBeforeAction: function() {
     var self = this;
diff --git a/LesionTracker/client/stylesheets/docking-container.css b/LesionTracker/client/stylesheets/docking-container.css
index 265bd5f69..fa15baec2 100644
--- a/LesionTracker/client/stylesheets/docking-container.css
+++ b/LesionTracker/client/stylesheets/docking-container.css
@@ -1,16 +1,17 @@
 /*****************************/
 /* Toggle */
 /*****************************/
-* {
-    box-sizing: border-box;
-}
 .dockingContainer, .collapseVertical, .collapseHorizontal {
+    -o-transition: all 0.3s ease-out;
+    -ms-transition: all 0.3s ease-out;
     -moz-transition: all 0.3s ease-out;
     -webkit-transition: all 0.3s ease-out;
     transition: all 0.3s ease-out;
 }
 
 .dockingContainer {
+    -o-transition: all 0.3s ease-out;
+    -ms-transition: all 0.3s ease-out;
     -moz-transition: all 0.3s ease-out;
     -webkit-transition: all 0.3s ease-out;
     transition: all 0.3s ease-out;
@@ -47,6 +48,8 @@
 
 .btnCollapseIcon-collapse{
     -moz-transform: rotate(180deg);
+    -ms-transform: rotate(180deg);
+    -o-transform: rotate(180deg);
     -webkit-transform: rotate(180deg);
     transform: rotate(180deg);
 }
diff --git a/OHIFViewer/client/components/viewer/toolRow/toolbar.html b/OHIFViewer/client/components/viewer/toolbar/toolbar.html
similarity index 100%
rename from OHIFViewer/client/components/viewer/toolRow/toolbar.html
rename to OHIFViewer/client/components/viewer/toolbar/toolbar.html
diff --git a/OHIFViewer/client/components/viewer/toolRow/toolbar.js b/OHIFViewer/client/components/viewer/toolbar/toolbar.js
similarity index 100%
rename from OHIFViewer/client/components/viewer/toolRow/toolbar.js
rename to OHIFViewer/client/components/viewer/toolbar/toolbar.js
diff --git a/OHIFViewer/client/components/viewer/toolbar/toolbar.styl b/OHIFViewer/client/components/viewer/toolbar/toolbar.styl
new file mode 100644
index 000000000..774a71141
--- /dev/null
+++ b/OHIFViewer/client/components/viewer/toolbar/toolbar.styl
@@ -0,0 +1,15 @@
+#toolbar
+  background-color: black
+  text-align: center
+  
+  .btn-group
+    display: inline-block
+    
+    button
+      text-align: center
+      color: #ffffff
+      background-color: #424242
+      border-color: #424242
+      
+      &.active, &:active
+        background-color: #3B678E
\ No newline at end of file
diff --git a/OHIFViewer/images/logo.png b/OHIFViewer/images/logo.png
new file mode 100644
index 000000000..da8c2746f
Binary files /dev/null and b/OHIFViewer/images/logo.png differ
diff --git a/Packages/viewerbase/components/studyBrowser/studyBrowser/studyBrowser.styl b/Packages/viewerbase/components/studyBrowser/studyBrowser/studyBrowser.styl
index f5487f6a8..1ed31828d 100644
--- a/Packages/viewerbase/components/studyBrowser/studyBrowser/studyBrowser.styl
+++ b/Packages/viewerbase/components/studyBrowser/studyBrowser/studyBrowser.styl
@@ -1,6 +1,8 @@
 .studyBrowser
   float: left
   height: 100%
-  width: 120px
+  width: 100%
+  min-width: 120px
   overflow: auto
-  background-color: black
\ No newline at end of file
+  background-color: black
+  padding-bottom: 20px
\ No newline at end of file