Refactor fc-media__media-wrapper
Fix merge conflicts