Handle defaults better
Update widget form and display