Added option to define if we are using a CDN or other container
Convertted tabs to spaces