Improving the toggles page