Revert "Forget to move some code"

This reverts commit 7e2cab22457d80e707dd0d4ccd7d809e5df2c587.
Revert "Switch-Button"

This reverts commit 2cc688c4cbc1b1ad4f12bcfa800402e15ae5d044.
Revert "Change Switchbutton"

This reverts commit 8b134f097741044d4d8df158ae5bbdf82929bd43.