Added popup and widget creation