diff --git a/ui/app/components/task-file.js b/ui/app/components/task-file.js
index a959438dd..e11a70e8f 100644
--- a/ui/app/components/task-file.js
+++ b/ui/app/components/task-file.js
@@ -13,6 +13,7 @@ export default Component.extend({
   allocation: null,
   task: null,
   file: null,
+  stat: null, // { Name, IsDir, Size, FileMode, ModTime, ContentType }
 
   // When true, request logs from the server agent
   useServer: false,
@@ -23,49 +24,78 @@ export default Component.extend({
   clientTimeout: 1000,
   serverTimeout: 5000,
 
-  didReceiveAttrs() {
-    if (this.allocation && this.task) {
-      // this.send('toggleStream');
+  mode: 'head',
+
+  fileComponent: computed('stat', function() {
+    // TODO: Switch to this.stat.ContentType
+    // TODO: Determine binary/unsupported non-text files to set to "cannot view" component
+    const matches = this.stat.Name.match(/^.+?\.(.+)$/);
+    const ext = matches ? matches[1] : '';
+
+    switch (ext) {
+      case 'jpg':
+      case 'jpeg':
+      case 'gif':
+      case 'png':
+        return 'image';
+      default:
+        return 'stream';
     }
-  },
+  }),
 
-  didInsertElement() {
-    this.fillAvailableHeight();
-  },
+  isLarge: computed('stat', function() {
+    return this.stat.Size > 50000;
+  }),
 
-  windowResizeHandler() {
-    run.once(this, this.fillAvailableHeight);
-  },
+  isStreamable: computed('stat', function() {
+    return false;
+    return this.stat.ContentType.startsWith('text/');
+  }),
 
-  fillAvailableHeight() {
-    // This math is arbitrary and far from bulletproof, but the UX
-    // of having the log window fill available height is worth the hack.
-    const margins = 30 + 30; // Account for padding and margin on either side of the CLI
-    const cliWindow = this.$('.cli-window');
-    cliWindow.height(window.innerHeight - cliWindow.offset().top - margins);
-  },
+  isStreaming: false,
 
-  fileUrl: computed('task.name', 'allocation.id', 'file', function() {
+  catUrl: computed('allocation.id', 'task.name', 'file', function() {
     return `/v1/client/fs/cat/${this.allocation.id}?path=${this.task.name}/${this.file}`;
   }),
 
-  logUrl: computed('allocation.id', 'allocation.node.httpAddr', 'useServer', function() {
-    const address = this.get('allocation.node.httpAddr');
-    const allocation = this.get('allocation.id');
+  fetchMode: computed('isLarge', 'mode', function() {
+    if (!this.isLarge) {
+      return 'cat';
+    } else if (this.mode === 'head') {
+      return 'readat';
+    }
 
-    const url = `/v1/client/fs/logs/${allocation}`;
-    return this.useServer ? url : `//${address}${url}`;
+    return 'stream';
   }),
 
-  logParams: computed('task', 'mode', function() {
-    return {
-      task: this.task,
-      type: this.mode,
-    };
+  fileUrl: computed(
+    'allocation.id',
+    'allocation.node.httpAddr',
+    'fetchMode',
+    'useServer',
+    function() {
+      const address = this.get('allocation.node.httpAddr');
+      const url = `/v1/client/fs/${this.fetchMode}/${this.allocation.id}`;
+      return this.useServer ? url : `//${address}${url}`;
+    }
+  ),
+
+  fileParams: computed('task.name', 'file', 'mode', function() {
+    const path = `${this.task.name}/${this.file}`;
+
+    switch (this.mode) {
+      case 'head':
+        return { path, offset: 0, limit: 50000 };
+      case 'tail':
+      case 'stream':
+        return { path, offset: 50000, origin: 'end' };
+      default:
+        return { path };
+    }
   }),
 
-  logger: logger('logUrl', 'logParams', function logFetch() {
-    // If the log request can't settle in one second, the client
+  logger: logger('fileUrl', 'fileParams', function logFetch() {
+    // If the file request can't settle in one second, the client
     // must be unavailable and the server should be used instead
     const timing = this.useServer ? this.serverTimeout : this.clientTimeout;
     return url =>
@@ -83,49 +113,17 @@ export default Component.extend({
       );
   }),
 
-  head: task(function*() {
-    yield this.get('logger.gotoHead').perform();
-    run.scheduleOnce('afterRender', () => {
-      this.$('.cli-window').scrollTop(0);
-    });
-  }),
-
-  tail: task(function*() {
-    yield this.get('logger.gotoTail').perform();
-    run.scheduleOnce('afterRender', () => {
-      const cliWindow = this.$('.cli-window');
-      cliWindow.scrollTop(cliWindow[0].scrollHeight);
-    });
-  }),
-
-  stream: task(function*() {
-    this.logger.on('tick', () => {
-      run.scheduleOnce('afterRender', () => {
-        const cliWindow = this.$('.cli-window');
-        cliWindow.scrollTop(cliWindow[0].scrollHeight);
-      });
-    });
-
-    yield this.logger.startStreaming();
-    this.logger.off('tick');
-  }),
-
-  willDestroy() {
-    this.logger.stop();
-  },
-
   actions: {
-    setMode(mode) {
-      this.logger.stop();
-      this.set('mode', mode);
-      this.stream.perform();
-    },
     toggleStream() {
-      if (this.get('logger.isStreaming')) {
-        this.logger.stop();
-      } else {
-        this.stream.perform();
-      }
+      this.toggleProperty('isStreaming');
+    },
+    gotoHead() {
+      this.set('mode', 'head');
+      this.set('isStreaming', false);
+    },
+    gotoTail() {
+      this.set('mode', 'tail');
+      this.set('isStreaming', false);
     },
     failoverToServer() {
       this.set('useServer', true);
diff --git a/ui/app/templates/components/task-file.hbs b/ui/app/templates/components/task-file.hbs
index fc43956e0..1846e34ce 100644
--- a/ui/app/templates/components/task-file.hbs
+++ b/ui/app/templates/components/task-file.hbs
@@ -6,19 +6,24 @@
 {{/if}}
 <div class="boxed-section-head">
   <span class="pull-right">
-    <a data-test-log-action="raw" class="button is-white" href="{{fileUrl}}" target="_blank" rel="noopener noreferrer">View Raw File</a>
-    {{#if isLarge}}
-      <button data-test-log-action="head" class="button is-white" onclick={{perform head}}>Head</button>
-      <button data-test-log-action="tail" class="button is-white" onclick={{perform tail}}>Tail</button>
+    <a data-test-log-action="raw" class="button is-white" href="{{catUrl}}" target="_blank" rel="noopener noreferrer">View Raw File</a>
+    {{#if (and isLarge isStreamable)}}
+      <button data-test-log-action="head" class="button is-white" onclick={{action "gotoHead"}}>Head</button>
+      <button data-test-log-action="tail" class="button is-white" onclick={{action "gotoTail"}}>Tail</button>
     {{/if}}
-    {{#if isStreaming}}
+    {{#if isStreamable}}
       <button data-test-log-action="toggle-stream" class="button is-white" onclick={{action "toggleStream"}}>
         {{x-icon (if logger.isStreaming "media-pause" "media-play") class="is-text"}}
       </button>
     {{/if}}
   </span>
 </div>
-<div data-test-log-box class="boxed-section-body is-dark is-full-bleed">
-  {{!-- switch file component here --}}
-  <pre data-test-log-cli class="cli-window"><code>{{logger.output}}</code></pre>
+<div data-test-file-box class="boxed-section-body {{if (eq fileComponent "stream") "is-dark is-full-bleed"}}">
+  {{#if (eq fileComponent "stream")}}
+    {{streaming-file logger=logger mode=mode isStreaming=isStreaming}}
+  {{else if (eq fileComponent "image")}}
+    {{image-file src=catUrl alt=stat.Name size=stat.Size}}
+  {{else}}
+    <h1>No component</h1>
+  {{/if}}
 </div>