Namespace css and add some fixes