Several updates on CSS