Dev/studio164a/draft mode editing

Merging into shortcode-submit branch