reorganize code a bit, in preparation for layout changes, #22
formatting
rename a local var
use relative layout for Mass control, closes #22