Fixed data modal display logic. Resolves #1