Revert feature and fix fields widgets