Fixed refactored widget manager