Merge storyline view

See issue #111.

I'd like to test this a little more and have someone else do the same, but if it looks ok we can merge.