Minor menu reorganization: Combined all masks and layers into one "Layers" folder.   Very minor title renaming for consistency.