Display monthly/yearly when display_switch false
Merge pull request #42 from Nurego/michael-dev

Display monthly/yearly when display_switch false