more updates to integrate new css