Use mediaType instead of the deprecated type property
Move menu styling into the default popover styling