adds switch button toggle
fixes button and switches layout