Fix bug with ProjectPreview
Merge pull request #529 from gannetson/feature/just-some-fixes

Fix bug with ProjectPreview