Added range selector for day and week
Some vetting