Use form done call and events for service toggle view

This will allow us to use hooks for events.