Adjust labels in multimedia editor
Rebase fixes