Removed improper semantic fields
Added widgets and more