Add scrubber view
Merge branch 'master' of https://github.com/mrh-is/Liftoff