Tested and fixed preview bugs