Start to fix for new css structure.