updated views for several time periods
Merge branch 'refs/heads/feature-plan'