Merge pull request #36 from vossgang/matt-copy

Matt copy
fixed timeline and flow layout