Better preview handling, should be easier for everyone