diff --git a/Packages/design/styles/variables.styl b/Packages/design/styles/variables.styl
index 68c0ac05d..1c57db906 100644
--- a/Packages/design/styles/variables.styl
+++ b/Packages/design/styles/variables.styl
@@ -17,8 +17,8 @@ $errorColor = #E29E4A
 $menuBackgroundColor = #F2F2F2
 
 // Sizes
-$topBarHeight = 30px
-$toolbarHeight = 50px
+$topBarHeight = 40px
+$toolbarHeight = 78px
 
 // Thicknesses
 $uiBorderThickness = 1px
diff --git a/Packages/lesiontracker/client/components/lesionTracker/lesionTracker.html b/Packages/lesiontracker/client/components/lesionTracker/lesionTracker.html
index 4a851fd23..33b8c0ffa 100644
--- a/Packages/lesiontracker/client/components/lesionTracker/lesionTracker.html
+++ b/Packages/lesiontracker/client/components/lesionTracker/lesionTracker.html
@@ -1,18 +1,20 @@
 <template name="lesionTracker">
     <div class="topBar {{#if onStudyList}}studyList{{/if}}">
-        <a class="brandSection pull-left" href="http://ohif.org">
-            <img class="logoImage" src="/images/logo.png">
-            <div class="logoText">
-                Open Health Imaging Foundation
+        <div class="clearfix p-x-1 p-t-1">
+            <a class="brandSection pull-left" href="http://ohif.org">
+                <img class="logoImage" src="/images/logo.png">
+                <div class="logoText">
+                    Open Health Imaging Foundation
+                </div>
+            </a>
+            {{ #if studyListToggleText }}
+            <div class="studyListLinkSection pull-left m-x-1 p-x-2 js-toggle-studyList">
+                {{studyListToggleText}}
+            </div>
+            {{ /if }}
+            <div class="userAccountSection pull-right">
+                {{>userAccountMenu}}
             </div>
-        </a>
-        {{ #if studyListToggleText }}
-        <div class="studyListLinkSection pull-left js-toggle-studyList">
-            {{studyListToggleText}}
-        </div>
-        {{ /if }}
-        <div class="userAccountSection pull-right">
-            {{>userAccountMenu}}
         </div>
     </div>
     {{ >timeoutCountdownDialog }}
@@ -32,4 +34,4 @@
     {{ >lastLoginModal }}
     {{ >studyContextMenu }}
     {{ >progressDialog}}
-</template>
\ No newline at end of file
+</template>
diff --git a/Packages/lesiontracker/client/components/lesionTracker/lesionTracker.styl b/Packages/lesiontracker/client/components/lesionTracker/lesionTracker.styl
index 52bcec0ea..a6b2ddec0 100644
--- a/Packages/lesiontracker/client/components/lesionTracker/lesionTracker.styl
+++ b/Packages/lesiontracker/client/components/lesionTracker/lesionTracker.styl
@@ -9,7 +9,7 @@ $expandedHeight = 160px
   transition(all 0.5s ease)
 
   .brandSection
-    height: 100%
+    height: 30px
     display: inline-block
 
     img.logoImage
@@ -25,14 +25,13 @@ $expandedHeight = 160px
       color: $textPrimaryColor
 
   .studyListLinkSection
-    color: $textSecondaryColor
     border-left: $uiBorderThickness solid $uiBorderColor;
-    font-weight: 400
-    font-size: 13px
-    line-height: 30px
-    padding: 0 10px
-    margin: 0 10px
+    color: $textSecondaryColor
     cursor: pointer
+    font-size: 13px
+    font-weight: 500
+    line-height: 26px
+    margin-top: 3px
 
     &:hover
       color: $hoverColor
@@ -48,6 +47,7 @@ $expandedHeight = 160px
     height: $expandedHeight
 
     .brandSection
+      height: 100%
       width: 80%
       padding-left: 50px
       line-height: $expandedHeight
diff --git a/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.html b/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.html
index 78926d588..b18950d48 100644
--- a/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.html
+++ b/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.html
@@ -1,75 +1,77 @@
 <template name="toolbarSection">
-    <div class="toolbarSection">
-        <div class="pull-left">
-            {{>roundedButtonGroup leftSidebarToggleButtonData}}
-        </div>
-        <div class="pull-left">
-            {{ #each toolbarButtons }}
-                {{ >toolbarSectionButton }}
-            {{ /each }}
+    <div class="toolbarSection p-x-2">
+        <div class="clearfix m-t-1">
+            <div class="pull-left">
+                {{>roundedButtonGroup leftSidebarToggleButtonData}}
+            </div>
+            <div class="toolbarSectionTools pull-left">
+                {{ #each toolbarButtons }}
+                    {{ >toolbarSectionButton }}
+                {{ /each }}
 
-            <div id="moreTools" class="toolbarSectionButton">
+                <div id="moreTools" class="toolbarSectionButton m-l-3">
+                    <div class="svgContainer">
+                        <svg>
+                            <use xlink:href="/packages/lesiontracker/assets/icons.svg#icon-tools-more"></use>
+                        </svg>
+                    </div>
+                    <div class="buttonLabel">
+                        More <i class="fa fa-caret-down" aria-hidden="true"></i>
+                    </div>
+                </div>
+            </div>
+
+            {{ >studySeriesQuickSwitch side="left"}}
+            {{ >studySeriesQuickSwitch side="right"}}
+
+            <div class="pull-right toolbarSectionEntry">
+                {{ >caseProgress }}
+            </div>
+            <div class="pull-right">
+                {{>roundedButtonGroup rightSidebarToggleButtonData}}
+            </div>
+            <!-- <div class="capsule-group pull-right">
+                <div id="lesionSidebarToggle" class="capsule-entry">
+                    <div class="svgContainer capsule">
+                        <svg>
+                            <use xlink:href="/packages/lesiontracker/assets/icons.svg#icon-measurements-lesions"></use>
+                        </svg>
+                    </div>
+                    <div class="buttonLabel">
+                        Lesions
+                    </div>
+                </div>
+                <div id="additionalMeasurementsSidebarToggle" class="capsule-entry">
+                    <div class="svgContainer capsule">
+                        <svg>
+                            <use xlink:href="/packages/lesiontracker/assets/icons.svg#icon-measurements-additional"></use>
+                        </svg>
+                    </div>
+                    <div class="buttonLabel">
+                        Additional
+                    </div>
+                </div>
+            </div> -->
+            <div id="toggleHUD" class="pull-right toolbarSectionButton">
                 <div class="svgContainer">
                     <svg>
-                        <use xlink:href="/packages/lesiontracker/assets/icons.svg#icon-tools-more"></use>
+                        <use xlink:href="/packages/lesiontracker/assets/icons.svg#icon-hud"></use>
                     </svg>
                 </div>
                 <div class="buttonLabel">
-                    More <i class="fa fa-caret-down" aria-hidden="true"></i>
+                    HUD
                 </div>
             </div>
-        </div>
-
-        {{ >studySeriesQuickSwitch side="left"}}
-        {{ >studySeriesQuickSwitch side="right"}}
-
-        <div class="pull-right toolbarSectionEntry">
-            {{ >caseProgress }}
-        </div>
-        <div class="pull-right">
-            {{>roundedButtonGroup rightSidebarToggleButtonData}}
-        </div>
-        <!-- <div class="capsule-group pull-right">
-            <div id="lesionSidebarToggle" class="capsule-entry">
-                <div class="svgContainer capsule">
+            <div class="pull-right toolbarSectionButton" data-toggle="modal" data-target="#optionsModal">
+                <div class="svgContainer">
                     <svg>
-                        <use xlink:href="/packages/lesiontracker/assets/icons.svg#icon-measurements-lesions"></use>
+                        <use xlink:href="/packages/lesiontracker/assets/icons.svg#icon-trial-info"></use>
                     </svg>
                 </div>
                 <div class="buttonLabel">
-                    Lesions
+                    Trial
                 </div>
             </div>
-            <div id="additionalMeasurementsSidebarToggle" class="capsule-entry">
-                <div class="svgContainer capsule">
-                    <svg>
-                        <use xlink:href="/packages/lesiontracker/assets/icons.svg#icon-measurements-additional"></use>
-                    </svg>
-                </div>
-                <div class="buttonLabel">
-                    Additional
-                </div>
-            </div>
-        </div> -->
-        <div id="toggleHUD" class="pull-right toolbarSectionButton">
-            <div class="svgContainer">
-                <svg>
-                    <use xlink:href="/packages/lesiontracker/assets/icons.svg#icon-hud"></use>
-                </svg>
-            </div>
-            <div class="buttonLabel">
-                HUD
-            </div>
-        </div>
-        <div class="pull-right toolbarSectionButton" data-toggle="modal" data-target="#optionsModal">
-            <div class="svgContainer">
-                <svg>
-                    <use xlink:href="/packages/lesiontracker/assets/icons.svg#icon-trial-info"></use>
-                </svg>
-            </div>
-            <div class="buttonLabel">
-                Trial
-            </div>
         </div>
     </div>
 </template>
diff --git a/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.js b/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.js
index 8d45c7b15..bb1888bd3 100644
--- a/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.js
+++ b/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.js
@@ -68,7 +68,7 @@ Template.toolbarSection.helpers({
         buttonData.push({
             id: 'bidirectional',
             title: 'Target',
-            classes: 'imageViewerTool',
+            classes: 'imageViewerTool m-l-3',
             svgLink: '/packages/lesiontracker/assets/icons.svg#icon-tools-measure-target'
         });
 
diff --git a/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.styl b/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.styl
index 4390c1401..bd17f0cc6 100644
--- a/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.styl
+++ b/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.styl
@@ -2,16 +2,19 @@
 
 .toolbarSection
   height: $toolbarHeight
+  padding-top: 6px
   width: 100%
   border-bottom: $uiBorderColor $uiBorderThickness solid
 
+  .toolbarSectionTools
+    margin-left: 41px
+
   .toolbarSectionButton
     display: inline-block
     color: $defaultColor
     fill: $defaultColor
     stroke: $defaultColor
-    padding: 0 10px
-    height: $toolbarHeight
+    padding: 0 7px
     min-width: 30px
     cursor: pointer
     text-align: center