context and modal changes
Merge pull request #882 from Tendrid/develop

context and modal changes