Reorganize some styles