Complete tests
Styling
Merge branch 'master' into timeline