integrating latest css changes