diff --git a/assets/scripts/app/templates/jobs/log.hbs b/assets/scripts/app/templates/jobs/log.hbs
index fe64e071..fa050efb 100644
--- a/assets/scripts/app/templates/jobs/log.hbs
+++ b/assets/scripts/app/templates/jobs/log.hbs
@@ -1,5 +1,5 @@
 {{#if view.log.isLoaded}}
-  {{view Travis.PreView logBinding="view.log" logUrlBinding="view.logUrl"}}
+  {{view Travis.PreView logBinding="view.log"}}
 
   {{#if view.job.sponsor.name}}
     <p class="sponsor">
diff --git a/assets/scripts/app/views/log.coffee b/assets/scripts/app/views/log.coffee
index fd99e324..d5474659 100644
--- a/assets/scripts/app/views/log.coffee
+++ b/assets/scripts/app/views/log.coffee
@@ -6,114 +6,23 @@ Travis.reopen
     logBinding: 'job.log'
     contextBinding: 'job'
 
-    init: ->
-      @_super.apply this, arguments
-
-    plainTextLogUrl: (->
-      if id = @get('job.log.id')
-        Travis.Urls.plainTextLog(id)
-    ).property('log')
-
     didInsertElement: ->
       job = @get('job')
       job.subscribe() if job && !job.get('isFinished')
 
-      @_super.apply this, arguments
-      #@tryScrollingToHashLineNumber()
-
-    scrollTo: (hash) ->
-      # and this is even more weird, when changing hash in URL in firefox
-      # to other value, for example #L10, it actually scrolls just #main
-      # element... this is probably some CSS issue, I don't have time to
-      # investigate at the moment
-      # TODO: fix this
-      $('#main').scrollTop 0
-
-      # weird, html works in chrome, body in firefox
-      $('html,body').scrollTop $(hash).offset().top
-
-      @set 'controller.lineNumberHash', null
-
-    lineNumberHashDidChange: (->
-      @tryScrollingToHashLineNumber()
-    ).observes('controller.lineNumberHash')
-
-    tryScrollingToHashLineNumber: ->
-      if hash = @get 'controller.lineNumberHash'
-        self = this
-
-        checker = ->
-          return if self.get('isDestroyed')
-
-          if $(hash).length
-            self.scrollTo(hash)
-          else
-            setTimeout checker, 100
-
-        checker()
-
-    click: ->
-      target = $(event.target)
-
-      target.closest('.fold').toggleClass('open')
-
-      if target.is('a') && target.attr('id') && target.attr('id').match(/^L\d+$/)
-        path = target.attr 'href'
-        Travis.get('router').route(path)
-        event.stopPropagation()
-        return false
-
     toTop: () ->
       $(window).scrollTop(0)
 
-    logUrl: (->
-      repo = @get('job.repo')
-      item = @get('parentView.currentItem')
-
-      if repo && item
-        event = if item.constructor == Travis.Build
-          'showBuild'
-        else
-          'showJob'
-
-        #Travis.get('router').urlForEvent(event, repo, item)
-    ).property('job.repo', 'parentView.currentItem')
-
   PreView: Em.View.extend
     templateName: 'jobs/pre'
 
-    createEngine: ->
-      limit = new Log.Limit
-      scroll = new Log.Scroll
-      engine = Log.create(listeners: [limit, new Log.FragmentRenderer, new Log.Folds, scroll])
-
-      @set('scroll', scroll)
-      @set('limit', limit)
-      @set('engine', engine)
-
-      @observeParts()
-
-    observeParts: ->
-      parts = @get('log.parts')
-      parts.addArrayObserver(@, didChange: 'partsDidChange', willChange: 'partsWillChange')
-      @partsDidChange(parts.slice(0))
-
     didInsertElement: ->
       @_super.apply this, arguments
       @createEngine()
 
     willDestroyElement: ->
       parts = @get('log.parts')
-      parts.removeArrayObserver(@, didChange: 'partsDidChange', willChange: 'partsWillChange')
-
-    partsWillChange: ->
-
-    partsDidChange: (parts, start, _, added) ->
-      unless @get('isLimited')
-        start ||= 0
-        added ||= parts.length
-        @get('engine').set(part.number, part.content) for part, i in parts.slice(start, start + added)
-        #@propertyDidChange('isLimited')
+      parts.removeArrayObserver(@, didChange: 'partsDidChange', willChange: 'noop')
 
     versionDidChange: (->
       @rerender() if @get('inDOM')
@@ -123,6 +32,28 @@ Travis.reopen
       @rerender() if @get('inDOM')
     ).observes('log')
 
+    createEngine: ->
+      @limit = new Log.Limit
+      @scroll = new Log.Scroll
+      @engine = Log.create(listeners: [@limit, new Log.FragmentRenderer, new Log.Folds, @scroll])
+      @observeParts()
+      @numberLineOnHover()
+
+    observeParts: ->
+      parts = @get('log.parts')
+      parts.addArrayObserver(@, didChange: 'partsDidChange', willChange: 'noop')
+      parts = parts.slice(0)
+      @partsDidChange(parts, 0, null, parts.length)
+
+    partsDidChange: (parts, start, _, added) ->
+      unless @get('isLimited')
+        @engine.set(part.number, part.content) for part, i in parts.slice(start, start + added)
+        @propertyDidChange('isLimited')
+
+    lineNumberDidChange: (->
+      @scroll.set(number) if !@get('isDestroyed') && number = @get('controller.lineNumber')
+    ).observes('controller.lineNumber')
+
     isLimited: (->
       @limit && @limit.isLimited()
     ).property()
@@ -132,29 +63,27 @@ Travis.reopen
     ).property('job.log.id')
 
     toggleTailing: (event) ->
-      Travis.app.tailing.toggle()
+      Travis.tailing.toggle()
       event.preventDefault()
 
-    lineNumbers: ->
+    numberLineOnHover: ->
       $('#log').on 'mouseenter', 'a', ->
         $(this).attr('href', '#L' + ($(this.parentNode).prevAll('p').length + 1))
 
-    folds: ->
-      $('#log').on 'click', '.fold', ->
-        $(this).toggleClass('open')
-
     click: (event) ->
-      target = $(event.target)
-      target.closest('.fold').toggleClass('open')
-      if target.is('a') && matches = target.attr('href')?.match(/#L(\d+)$/)
-        Travis.app.get('router.location').setURL(target.attr('href'))
-        @set('controller.lineNumber', matches[1])
+      if (href = $(event.target).attr('href')) && matches = href?.match(/#L(\d+)$/)
+        @lineNumberClicked(matches[1])
         event.stopPropagation()
-        return false
+        false
+      else
+        target = $(event.target)
+        target.closest('.fold').toggleClass('open')
 
-    lineNumberObserver: (->
-      @scroll.set(number) if !@get('isDestroyed') && number = @get('controller.lineNumber')
-    ).observes('controller.lineNumber')
+    lineNumberClicked: (number) ->
+      window.history.pushState(null, null, "#{window.location.pathname}#L#{number}");
+      @set('controller.lineNumber', number)
+
+    noop: -> # TODO required?
 
 Log.Scroll = ->
 Log.Scroll.prototype = $.extend new Log.Listener,