Media merged with music, minor layout issues