Added css url() update and refactoring