Shortcode Template Bug Fixes

- Fixes to shortcode template edit page
- Allow edting of existing template from Shortcode create page