Added media interactions, fixed templating for lightbox
fixed conflicts