removed switch
Merge pull request #2 from CD2/layout

removed switch