improved Widget Handling and rendering