Shortcode Edit pages:
- code cleanup & bug fix