Proper labeling for controls

Signed-off-by: Joseph Lee <josephl@cecs.pdx.edu>