more inline css removed
merge conflict
lightbox tweaks
merge conflict resolved