Fixes for the live youtube version with toggling