Added styling and numeric timespan representation
Merge remote-tracking branch 'origin/master'