New preview and some minor tweaks