Mostly changes to templates, small CSS additions and lightbox