Added toggles and switch