Few more tweaks and add popout preview window