Merge pull request #496 from shutter111/development

updated modal header title -- many other udpates