Do some CSS reorganization