labels on angles
moved volume settings into respective states