Added date picker and macro toggles