Css support and some updates