Reorganize the sound panel

Change-Id: I9843a9b9ac74297e3326a3ae72e0a203c808a290