1st round of changes for widget, not working for shortcode yet
Fixes bug and re-work on HTML block structure
In progress for shortcode support