Fix conflict with @johnregan3 PR and adds support for expading widget control on widget preview click