Small preview window improvements, ref #161