Fixed version of before/after block generation of widgets
Merge branch 'staging' of github.com:Placester/builder into staging