Adding current and hourly

Also, changed view to sync with project requirements:  Current, hourly,
daily, and weekly