Add the time axis
Merge branch 'time-axis' into develop
Merge branch 'develop'
Minor style fixes in the time axis
Merge branch 'time-axis' into develop
Merge branch 'develop'