Bug fixes and css url cleaning