Move toggle system to individual dialog, reduce view overload