initial run through of settings. basically removing labels and put it in a general order.

Signed-off-by: Joe Whitsitt <joe-whitsitt@uiowa.edu>