Modified the studio edit view to work with latest changes