Added some help text to the shortcodes
Fixes for the Create Shortcode Template Cleanup preview pane.
Cleanup and consolidation.