Rearrange audio details. Related to #377