Reduced borders that were not necessary in dialog

Change-Id: I2ecb920a5929c466d76c599d17cf9af235cab91a
Simplified plugin names

Change-Id: I7ec73acd472ad897e19f6f0eee9a84cfe297fd81
Adjust for mass being a general descriptor

The mass field was moved from a special field to one of the set of
descriptors.

Change-Id: I3df564c0bda01cc46aea2b6516cdeb174cf44070
Merge branch 'enhancements'

Change-Id: I1e67172630e59cfd32ab407e184cbd6c7da89a59