Refactored object widgets (one level deeper in module hierarchy)