changes merged (masonry, menu, videos)