CSS switch and bug fix.