Clean up of the Masks and Colors forms.  Stacked all icons on right.  Used gridbag layout in an effort to make these windows crunch friendly.