[Fix] Switcher display
Merge pull request #47 from Nurego/michael-dev

[Fix] Switcher display