Minor updates in preview sub functions.
Not Ready for production