Fixed modal widget anomaly, modal label changes

Fixed problem translating from old project settings to new when “map”
was chosen as a modal entry point
Minor function and variable name changes anticipating more updates
Updated function comments