Fix for #1692, Fix for #1691, Fix for #1690, Add Preview area