Adding better preview window