Merge pull request #1 from jessyurko/dev

Dev
view layout switch