Some more refactoring.
Only the Render widget class left.