improving toggles page