Some embodiments provide a storyboard tool for displaying and editing a storyboard representation of a set of clips that forms a composite presentation in a media-editing application. For the set of clips in a composite display area, the tool displays a set of thumbnails corresponding to the clips in a storyboard display area. Each thumbnail in the storyboard display area respectively represents a particular clip of the composite presentation and is respectively associated with the particular clip in the composite display area. The tool allows a user to visualize the entire context of the composite presentation as a storyboard representation of the clips in the composite display area. Some embodiments provide for non-destructive editing that modify the order of the thumbnails in the storyboard display area without affecting the clips in the composite display area. The storyboard tool can synchronize the edited order of clips to the composite display area.