Squashed 'app/' changes from 3c5796d..278bcc6

278bcc6 Fix some spacing, added switch classes

git-subtree-dir: app
git-subtree-split: 278bcc6b4753a44eec64b7015aae7878c384a607
Merge commit '232cf2bcbb405f44ac80807b44a3468b6ee46f3e'