Add media-queries support (resolutions), fill metadata, small fixes