CSS optimization and bug fix.