Did a lot of cleanup. But Widget doesn't update properly when entering module in a fresh scene.