New popup widget & some small changes