Improved handling of Root Widget