CSS fixes and generalization