Patched in DavidS changes to fix up the preview modes
Merge pull request #157 from JamesH65/preview_fixes2

Patched in DavidS changes to fix up the preview modes