Add some CSS comments, move some rules