Sort Sound settings a bit

Change-Id: Ie091940bbeb09bd3a8c53904dfa556bfc62cb04d