Main popup now Angular based