Simplified widget syntax
Removed original widget code
Respect widgets option