Update preview mode
Merge pull request #1384 from EmmanuelVella/preview

Update preview mode