Improve toggle options component
Add support for activity searching