Improved preview view