Refacted previewing a bit