Adding in a way to only have one modal open at a time.
Merge remote-tracking branch 'origin/master'