Improved toggleWebsite and FIX general toggle