Merge pull request #86 from alxdarksage/develop

Updates based on Shannon's comments, new assets
Merge pull request #87 from alxdarksage/develop

Fixing merge
More additions to consent wizard