diff --git a/src/applications/pholio/view/PholioMockImagesView.php b/src/applications/pholio/view/PholioMockImagesView.php
index efa3917d14..27bf1cc320 100644
--- a/src/applications/pholio/view/PholioMockImagesView.php
+++ b/src/applications/pholio/view/PholioMockImagesView.php
@@ -1,110 +1,109 @@
 <?php
 
 final class PholioMockImagesView extends AphrontView {
 
   private $mock;
 
   public function setMock(PholioMock $mock) {
     $this->mock = $mock;
     return $this;
   }
 
   public function render() {
     if (!$this->mock) {
       throw new Exception("Call setMock() before render()!");
     }
 
     $main_image_id = celerity_generate_unique_node_id();
     require_celerity_resource('javelin-behavior-pholio-mock-view');
     $config = array(
       'mainID' => $main_image_id,
       'mockID' => $this->mock->getID());
     Javelin::initBehavior('pholio-mock-view', $config);
 
     $mockview = '';
 
     $main_image = head($this->mock->getImages());
 
     $main_image_tag = javelin_tag(
       'img',
       array(
         'id' => $main_image_id,
         'src' => $main_image->getFile()->getBestURI(),
         'sigil' => 'mock-image',
         'class' => 'pholio-mock-image',
         'meta' => array(
           'fullSizeURI' => $main_image->getFile()->getBestURI(),
           'imageID' => $main_image->getID(),
         ),
     ));
 
     $main_image_tag = javelin_tag(
       'div',
       array(
         'id' => 'mock-wrapper',
         'sigil' => 'mock-wrapper',
         'class' => 'pholio-mock-wrapper'
       ),
       $main_image_tag);
 
-
     $inline_comments_holder = javelin_tag(
       'div',
       array(
         'id' => 'mock-inline-comments',
         'sigil' => 'mock-inline-comments',
         'class' => 'pholio-mock-inline-comments'
       ),
       '');
 
     $mockview[] = phutil_tag(
       'div',
         array(
           'class' => 'pholio-mock-image-container',
           'id' => 'pholio-mock-image-container'
         ),
       array($main_image_tag, $inline_comments_holder));
 
     if (count($this->mock->getImages()) > 1) {
       $thumbnails = array();
       foreach ($this->mock->getImages() as $image) {
         $thumbfile = $image->getFile();
 
         $dimensions = PhabricatorImageTransformer::getPreviewDimensions(
           $thumbfile,
           140);
 
         $tag = phutil_tag(
           'img',
           array(
             'width' => $dimensions['sdx'],
             'height' => $dimensions['sdy'],
             'src' => $thumbfile->getPreview140URI(),
             'class' => 'pholio-mock-carousel-thumbnail',
             'style' => 'top: '.floor((140 - $dimensions['sdy'] ) / 2).'px',
         ));
 
         $thumbnails[] = javelin_tag(
           'div',
           array(
             'sigil' => 'mock-thumbnail',
             'class' => 'pholio-mock-carousel-thumb-item',
             'meta' => array(
               'fullSizeURI' => $thumbfile->getBestURI(),
               'imageID' => $image->getID()
             ),
           ),
           $tag);
       }
 
       $mockview[] = phutil_tag(
         'div',
         array(
           'class' => 'pholio-mock-carousel',
         ),
         $thumbnails);
     }
 
     return $this->renderSingleView($mockview);
   }
 }
diff --git a/webroot/rsrc/css/application/pholio/pholio.css b/webroot/rsrc/css/application/pholio/pholio.css
index 9e851b2cd2..4648a916ac 100644
--- a/webroot/rsrc/css/application/pholio/pholio.css
+++ b/webroot/rsrc/css/application/pholio/pholio.css
@@ -1,96 +1,100 @@
 /**
  * @provides pholio-css
  */
 .pholio-mock-image-container {
   background-color: #282828;
   text-align: center;
   vertical-align: middle;
+  position: relative;
 }
 
 .pholio-mock-carousel {
   background-color: #202020;
   text-align: center;
   border-top: 1px solid #101010;
 }
 
 .pholio-mock-carousel-thumb-item {
   display: inline-block;
   cursor: pointer;
   width: 140px;
   height: 140px;
   padding: 5px;
   margin: 3px;
   background: #282828;
   vertical-align: middle;
   border: 1px solid #383838;
   position: relative;
 }
 
 .device-desktop .pholio-mock-carousel-thumb-item:hover {
   background: #383838;
   border-color: #686868;
 }
 
 .pholio-mock-carousel-thumbnail {
   margin: auto;
   position: relative;
 }
 
 .pholio-mock-image {
   display: inline-block;
 }
 
 .pholio-mock-select-border {
   position: absolute;
   background: #ffffff;
   opacity: 0.25;
   box-sizing: border-box;
   border: 1px solid #000000;
 }
 
 .pholio-mock-select-fill {
   position: absolute;
   border: 1px dashed #ffffff;
   box-sizing: border-box;
 }
 
 .pholio-mock-wrapper {
   position: relative;
+  margin: 20px 340px 20px 20px;
   display: inline-block;
   cursor: crosshair;
   padding: 0px;
-  margin: 10px 0px;
 }
 
-
 .pholio-mock-inline-comments {
-  display: inline-block;
-  margin-left: 10px;
+  width: 320px;
+  border-left: 1px solid #101010;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  overflow-x: auto;
   text-align: left;
-  padding-bottom: 10px;
 }
 
 .pholio-inline-comment {
   border: 1px solid #aa8;
   background: #f9f9f1;
-  margin-bottom: 2px;
+  margin: 2px;
   padding: 8px 10px;
 }
 
 .pholio-inline-comment-header {
   border-bottom: 1px solid #cca;
   color: #333;
   font-weight: bold;
   padding-bottom: 6px;
   margin-bottom: 4px;
 }
 
 .pholio-mock-inline-comment-highlight {
   background-color: #F0B160;
 }
 
 .pholio-inline-head-links a {
   font-weight: normal;
   margin-left: 5px;
 }