Move createModal from event to after load complete
Merge pull request #460 from shutter111/development

Move createModal from event to after load complete