Bug fixes, updates to form tool, and editor enhancements for shortcodes