Fix some spacing, added switch classes