preview improvements