fix widgets, fix required fields