Update github link
Add some switch spacing