(Feat) Add calling, update UI