CSS cleanup and filtering finished