Adding a switch button.
Small fixes.