Toggle buttons fix